diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2019-10-31 12:32:07 -0400 |
|---|---|---|
| committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-10-31 12:32:07 -0400 |
| commit | 9c94b48bf154fff1ac3550213ddb65b33fbb6ba8 (patch) | |
| tree | e7ad5ba3aa90d3cb57906bf38d3c2cac352e95d3 /synapse/groups | |
| parent | clean up code a bit (diff) | |
| parent | Update black to 19.10b0 (#6304) (diff) | |
| download | synapse-9c94b48bf154fff1ac3550213ddb65b33fbb6ba8.tar.xz | |
Merge branch 'develop' into uhoreg/cross_signing_fix_workers_notify
Diffstat (limited to 'synapse/groups')
| -rw-r--r-- | synapse/groups/attestations.py | 2 | ||||
| -rw-r--r-- | synapse/groups/groups_server.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/groups/attestations.py b/synapse/groups/attestations.py index dfd7ae041b..d950a8b246 100644 --- a/synapse/groups/attestations.py +++ b/synapse/groups/attestations.py @@ -181,7 +181,7 @@ class GroupAttestionRenewer(object): elif not self.is_mine_id(user_id): destination = get_domain_from_id(user_id) else: - logger.warn( + logger.warning( "Incorrectly trying to do attestations for user: %r in %r", user_id, group_id, diff --git a/synapse/groups/groups_server.py b/synapse/groups/groups_server.py index 8f10b6adbb..29e8ffc295 100644 --- a/synapse/groups/groups_server.py +++ b/synapse/groups/groups_server.py @@ -488,7 +488,7 @@ class GroupsServerHandler(object): profile = yield self.profile_handler.get_profile_from_cache(user_id) user_profile.update(profile) except Exception as e: - logger.warn("Error getting profile for %s: %s", user_id, e) + logger.warning("Error getting profile for %s: %s", user_id, e) user_profiles.append(user_profile) return {"chunk": user_profiles, "total_user_count_estimate": len(invited_users)} |