paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 21:43:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

python: Modernize legacy Python 2 syntax with pyupgrade.

Browse Source 
Generated by `pyupgrade --py3-plus --keep-percent-format` on all our
Python code except `zthumbor` and `zulip-ec2-configure-interfaces`,
followed by manual indentation fixes.

Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
This commit is contained in:
Anders Kaseorg
2020-04-09 12:51:58 -07:00
committed by Tim Abbott
parent fff2d3958a
commit c734bbd95d
567 changed files with 1877 additions and 2564 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
zerver/views/streams.py
View File

@@ -250,7 +250,7 @@ def remove_subscriptions_backend(
) -> HttpResponse:
removing_someone_else = principals and \
set(principals) != set((user_profile.email,))
set(principals) != {user_profile.email}
if removing_someone_else and not user_profile.is_realm_admin:
# You can only unsubscribe other people from a stream if you are a realm
@@ -264,10 +264,10 @@ def remove_subscriptions_backend(
streams, __ = list_to_streams(streams_as_dict, user_profile)
if principals:
people_to_unsub = set(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 = set([user_profile])
people_to_unsub = {user_profile}
result = dict(removed=[], not_removed=[]) # type: Dict[str, List[str]]
(removed, not_subscribed) = bulk_remove_subscriptions(people_to_unsub, streams,
@@ -359,9 +359,9 @@ def add_subscriptions_backend(
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 = set(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 = set([user_profile])
subscribers = {user_profile}
(subscribed, already_subscribed) = bulk_add_subscriptions(streams, subscribers,
acting_user=user_profile, color_map=color_map)
@@ -377,7 +377,7 @@ def add_subscriptions_backend(
for (subscriber, stream) in already_subscribed:
result["already_subscribed"][subscriber.email].append(stream.name)
bots = dict((subscriber.email, subscriber.is_bot) for subscriber in subscribers)
bots = {subscriber.email: subscriber.is_bot for subscriber in subscribers}
newly_created_stream_names = {s.name for s in created_streams}