From bbcdf8ca998b14134bb3bd07e44f96dfae2035e7 Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Wed, 30 May 2018 09:22:01 -0700 Subject: [PATCH] upload: Fix logic for orientation when uploading avatars. The previous logic was broken for an avatar without exif data. --- zerver/lib/upload.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/zerver/lib/upload.py b/zerver/lib/upload.py index dcd9d3c693..a0133c073a 100644 --- a/zerver/lib/upload.py +++ b/zerver/lib/upload.py @@ -85,9 +85,13 @@ name_to_tag_num = dict((name, num) for num, name in ExifTags.TAGS.items()) # https://stackoverflow.com/a/6218425 def exif_rotate(image: Image) -> Image: - if hasattr(image, '_getexif') is False: + if not hasattr(image, '_getexif'): return image - exif_dict = dict(image._getexif().items()) + exif_data = image._getexif() + if exif_data is None: + return image + + exif_dict = dict(exif_data.items()) orientation = exif_dict.get(name_to_tag_num['Orientation']) if orientation == 3: