Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

backends: Remove unnecessary deepcopy. 

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg 2020-10-23 19:26:46 -07:00 committed by Tim Abbott
parent 3ad1335a97
commit bb2db31f29
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zproject/backends.py
View File

@ -13,7 +13,6 @@
# settings.AUTHENTICATION_BACKENDS that have a function signature # settings.AUTHENTICATION_BACKENDS that have a function signature
# matching the args/kwargs passed in the authenticate() call. # matching the args/kwargs passed in the authenticate() call.
import binascii import binascii
import copy
import json import json
import logging import logging
from abc import ABC, abstractmethod from abc import ABC, abstractmethod
@ -550,13 +549,12 @@ class ZulipLDAPAuthBackendBase(ZulipAuthMixin, LDAPBackend):
# Don't do work to replace the avatar with itself. # Don't do work to replace the avatar with itself.
return return
io = BytesIO(ldap_avatar)
# Structurally, to make the S3 backend happy, we need to # Structurally, to make the S3 backend happy, we need to
# provide a Content-Type; since that isn't specified in # provide a Content-Type; since that isn't specified in
# any metadata, we auto-detect it. # any metadata, we auto-detect it.
content_type = magic.from_buffer(copy.deepcopy(io).read()[0:1024], mime=True) content_type = magic.from_buffer(ldap_avatar[:1024], mime=True)
if content_type.startswith("image/"): if content_type.startswith("image/"):
upload_avatar_image(io, user, user, content_type=content_type) upload_avatar_image(BytesIO(ldap_avatar), user, user, content_type=content_type)
do_change_avatar_fields(user, UserProfile.AVATAR_FROM_USER, acting_user=None) do_change_avatar_fields(user, UserProfile.AVATAR_FROM_USER, acting_user=None)
# Update avatar hash. # Update avatar hash.
user.avatar_hash = user_avatar_content_hash(ldap_avatar) user.avatar_hash = user_avatar_content_hash(ldap_avatar)