From 7d9f24c58cba60b77825471b643c8edcfdcbc96b Mon Sep 17 00:00:00 2001 From: Steve Howell Date: Thu, 16 Jul 2020 12:56:12 +0000 Subject: [PATCH] mypy: Fix Realm types in test_import_export. It's not clear to me why these passed mypy before, given this: def assert_realm_values(f: Callable[[Realm], Any], ... But this is clearly more accurate. --- zerver/tests/test_import_export.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zerver/tests/test_import_export.py b/zerver/tests/test_import_export.py index d4584cdafd..fb582e5280 100644 --- a/zerver/tests/test_import_export.py +++ b/zerver/tests/test_import_export.py @@ -840,7 +840,7 @@ class ImportExportTest(ZulipTestCase): assert_realm_values(get_realm_audit_log_event_type) # test huddles - def get_huddle_hashes(r: str) -> str: + def get_huddle_hashes(r: Realm) -> str: short_names = ['cordelia', 'hamlet', 'othello'] user_id_list = [UserProfile.objects.get(realm=r, short_name=name).id for name in short_names] huddle_hash = get_huddle_hash(user_id_list) @@ -848,7 +848,7 @@ class ImportExportTest(ZulipTestCase): assert_realm_values(get_huddle_hashes, equal=False) - def get_huddle_message(r: str) -> str: + def get_huddle_message(r: Realm) -> str: huddle_hash = get_huddle_hashes(r) huddle_id = Huddle.objects.get(huddle_hash=huddle_hash).id huddle_recipient = Recipient.objects.get(type_id=huddle_id, type=3) @@ -869,7 +869,7 @@ class ImportExportTest(ZulipTestCase): assert_realm_values(get_alertwords) # test userhotspot - def get_user_hotspots(r: str) -> Set[str]: + def get_user_hotspots(r: Realm) -> Set[str]: user_profile = UserProfile.objects.get(realm=r, short_name='hamlet') hotspots = UserHotspot.objects.filter(user=user_profile) user_hotspots = {hotspot.hotspot for hotspot in hotspots} @@ -891,7 +891,7 @@ class ImportExportTest(ZulipTestCase): lambda r: {group.name for group in UserGroup.objects.filter(realm=r)}, ) - def get_user_membership(r: str) -> Set[str]: + def get_user_membership(r: Realm) -> Set[str]: usergroup = UserGroup.objects.get(realm=r, name='hamletcharacters') usergroup_membership = UserGroupMembership.objects.filter(user_group=usergroup) users = {membership.user_profile.email for membership in usergroup_membership}