Просмотр исходного кода

Don't redefine exception but split the code

Sander Steffann 6 лет назад
Родитель
Сommit
02a009b7a7
1 измененных файлов с 7 добавлено и 4 удалено
  1. 7 4
      netbox/extras/models.py

+ 7 - 4
netbox/extras/models.py

@@ -755,13 +755,16 @@ class ImageAttachment(models.Model):
         """
         from django.conf import settings
         if settings.MEDIA_STORAGE and settings.MEDIA_STORAGE['BACKEND'] == 'S3':
-            from botocore.exceptions import ClientError as AccessError
-        else:
-            AccessError = OSError
+            # For S3 we need to handle a different exception
+            from botocore.exceptions import ClientError
+            try:
+                return self.image.size
+            except ClientError:
+                return None
 
         try:
             return self.image.size
-        except AccessError:
+        except OSError:
             return None