Merge pull request #204 from sevdog/fix-realdownload-check

Use safer check in RealDownloadMiddleware
jazzband · Jul 31, 2024 · 71488c4 · 71488c4
2 parents 6c7b7f8 + d385cbb
commit 71488c4
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/django_downloadview/middlewares.py b/django_downloadview/middlewares.py
@@ -75,14 +75,10 @@ def is_download_response(self, response):
         whose file attribute have either an URL or a file name.
 
         """
-        if super().is_download_response(response):
-            try:
-                return response.file.url or response.file.name
-            except AttributeError:
-                return False
-            else:
-                return True
-        return False
+        return (
+            super().is_download_response(response)
+            and bool(getattr(response.file, 'url', None) or getattr(response.file, 'name', None))
+        )
 
 
 class DownloadDispatcher: