paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-08 07:52:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

typing: Avoid redefinition of variables with different types.

Browse Source 
Signed-off-by: Zixuan James Li <p359101898@gmail.com>
This commit is contained in:
Zixuan James Li
2022-06-14 22:24:28 -04:00
committed by Tim Abbott
parent 5fd278bf09
commit c567e44408
5 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
zerver/lib/test_classes.py
View File

@@ -1517,25 +1517,25 @@ Output:
""" """
dct = {} dct = {}
for row in RealmEmoji.objects.all(): for realm_emoji in RealmEmoji.objects.all():
dct[row.id] = row dct[realm_emoji.id] = realm_emoji
if not dct: if not dct:
raise AssertionError("test needs RealmEmoji rows") raise AssertionError("test needs RealmEmoji rows")
count = 0 count = 0
for row in Reaction.objects.filter(reaction_type=Reaction.REALM_EMOJI): for reaction in Reaction.objects.filter(reaction_type=Reaction.REALM_EMOJI):
realm_emoji_id = int(row.emoji_code) realm_emoji_id = int(reaction.emoji_code)
assert realm_emoji_id in dct assert realm_emoji_id in dct
self.assertEqual(dct[realm_emoji_id].name, row.emoji_name) self.assertEqual(dct[realm_emoji_id].name, reaction.emoji_name)
self.assertEqual(dct[realm_emoji_id].realm_id, row.user_profile.realm_id) self.assertEqual(dct[realm_emoji_id].realm_id, reaction.user_profile.realm_id)
count += 1 count += 1
for row in UserStatus.objects.filter(reaction_type=UserStatus.REALM_EMOJI): for user_status in UserStatus.objects.filter(reaction_type=UserStatus.REALM_EMOJI):
realm_emoji_id = int(row.emoji_code) realm_emoji_id = int(user_status.emoji_code)
assert realm_emoji_id in dct assert realm_emoji_id in dct
self.assertEqual(dct[realm_emoji_id].name, row.emoji_name) self.assertEqual(dct[realm_emoji_id].name, user_status.emoji_name)
self.assertEqual(dct[realm_emoji_id].realm_id, row.user_profile.realm_id) self.assertEqual(dct[realm_emoji_id].realm_id, user_status.user_profile.realm_id)
count += 1 count += 1
if count == 0: if count == 0:

9
zerver/lib/user_topics.py
View File

@@ -120,11 +120,12 @@ def exclude_topic_mutes(
# by not considering topic mutes outside the stream. # by not considering topic mutes outside the stream.
query = query.filter(stream_id=stream_id) query = query.filter(stream_id=stream_id)
query = query.values( rows = list(
"recipient_id", query.values(
"topic_name", "recipient_id",
"topic_name",
)
) )
rows = list(query)
if not rows: if not rows:
return conditions return conditions

12
zerver/tests/test_bots.py
View File

@@ -198,9 +198,9 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
users_result = self.client_get("/json/users") users_result = self.client_get("/json/users")
members = orjson.loads(users_result.content)["members"] members = orjson.loads(users_result.content)["members"]
[bot] = [m for m in members if m["email"] == "hambot-bot@zulip.testserver"] [bot_dict] = [m for m in members if m["email"] == "hambot-bot@zulip.testserver"]
self.assertEqual(bot["bot_owner_id"], self.example_user("hamlet").id) self.assertEqual(bot_dict["bot_owner_id"], self.example_user("hamlet").id)
self.assertEqual(bot["user_id"], self.get_bot_user(email).id) self.assertEqual(bot_dict["user_id"], self.get_bot_user(email).id)
@override_settings(FAKE_EMAIL_DOMAIN="fakedomain.com", REALM_HOSTS={"zulip": "127.0.0.1"}) @override_settings(FAKE_EMAIL_DOMAIN="fakedomain.com", REALM_HOSTS={"zulip": "127.0.0.1"})
def test_add_bot_with_fake_email_domain(self) -> None: def test_add_bot_with_fake_email_domain(self) -> None:
@@ -362,9 +362,9 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
users_result = self.client_get("/json/users") users_result = self.client_get("/json/users")
members = orjson.loads(users_result.content)["members"] members = orjson.loads(users_result.content)["members"]
[bot] = [m for m in members if m["email"] == "hambot-bot@zulip.testserver"] [bot_dict] = [m for m in members if m["email"] == "hambot-bot@zulip.testserver"]
self.assertEqual(bot["bot_owner_id"], user.id) self.assertEqual(bot_dict["bot_owner_id"], user.id)
self.assertEqual(bot["user_id"], self.get_bot_user(email).id) self.assertEqual(bot_dict["user_id"], self.get_bot_user(email).id)
def test_bot_add_subscription(self) -> None: def test_bot_add_subscription(self) -> None:
""" """

5
zerver/tests/test_user_groups.py
View File

@@ -41,8 +41,9 @@ class UserGroupTestCase(ZulipTestCase):
realm = get_realm("zulip") realm = get_realm("zulip")
user_group = UserGroup.objects.first() user_group = UserGroup.objects.first()
assert user_group is not None assert user_group is not None
membership = UserGroupMembership.objects.filter(user_group=user_group) membership = UserGroupMembership.objects.filter(user_group=user_group).values_list(
membership = membership.values_list("user_profile_id", flat=True) "user_profile_id", flat=True
)
empty_user_group = create_user_group("newgroup", [], realm) empty_user_group = create_user_group("newgroup", [], realm)
user_groups = user_groups_in_realm_serialized(realm) user_groups = user_groups_in_realm_serialized(realm)

4
zerver/views/message_send.py
View File

@@ -76,8 +76,8 @@ def create_mirrored_message_users(
for email in referenced_users: for email in referenced_users:
create_mirror_user_if_needed(user_profile.realm, email, fullname_function) create_mirror_user_if_needed(user_profile.realm, email, fullname_function)
sender = get_user_including_cross_realm(sender_email, user_profile.realm) sender_user_profile = get_user_including_cross_realm(sender_email, user_profile.realm)
return sender return sender_user_profile
def same_realm_zephyr_user(user_profile: UserProfile, email: str) -> bool: def same_realm_zephyr_user(user_profile: UserProfile, email: str) -> bool: