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

mypy: Fix rebase errors in create_user.py.

Browse Source
This commit is contained in:
Tim Abbott
2018-05-23 11:35:01 -07:00
parent 8369e2b15e
commit 9c29592178
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zerver/lib/create_user.py
View File

@@ -24,8 +24,6 @@ def copy_user_settings(source_profile: UserProfile, target_profile: UserProfile)
value = getattr(source_profile, settings_name) value = getattr(source_profile, settings_name)
setattr(target_profile, settings_name, value) setattr(target_profile, settings_name, value)
return target_profile
# create_user_profile is based on Django's User.objects.create_user, # 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 # except that we don't save to the database so it can used in
# bulk_creates # bulk_creates

2
zerver/tests/test_users.py
View File

@@ -383,7 +383,7 @@ class UserProfileTest(ZulipTestCase):
cordelia.enable_stream_push_notifications = True cordelia.enable_stream_push_notifications = True
cordelia.save() cordelia.save()
cordelia = copy_user_settings(cordelia, iago) copy_user_settings(cordelia, iago)
# We verify that cordelia and iago match, but hamlet has the defaults. # We verify that cordelia and iago match, but hamlet has the defaults.
self.assertEqual(iago.default_language, "de") self.assertEqual(iago.default_language, "de")