Use new 'download_name' & 'max_age' params for send_file

apache · May 12, 2023 · fc92e6c · fc92e6c
1 parent 7fe0ca1
commit fc92e6c
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/superset/charts/api.py b/superset/charts/api.py
@@ -805,7 +805,7 @@ def export(self, **kwargs: Any) -> Response:
             buf,
             mimetype="application/zip",
             as_attachment=True,
-            attachment_filename=filename,
+            download_name=filename,
         )
         if token:
             response.set_cookie(token, "done", max_age=600)

diff --git a/superset/dashboards/api.py b/superset/dashboards/api.py
@@ -819,7 +819,7 @@ def export(self, **kwargs: Any) -> Response:
                 buf,
                 mimetype="application/zip",
                 as_attachment=True,
-                attachment_filename=filename,
+                download_name=filename,
             )
             if token:
                 response.set_cookie(token, "done", max_age=600)

diff --git a/superset/databases/api.py b/superset/databases/api.py
@@ -1058,7 +1058,7 @@ def export(self, **kwargs: Any) -> Response:
             buf,
             mimetype="application/zip",
             as_attachment=True,
-            attachment_filename=filename,
+            download_name=filename,
         )
         if token:
             response.set_cookie(token, "done", max_age=600)

diff --git a/superset/datasets/api.py b/superset/datasets/api.py
@@ -524,7 +524,7 @@ def export(self, **kwargs: Any) -> Response:
                 buf,
                 mimetype="application/zip",
                 as_attachment=True,
-                attachment_filename=filename,
+                download_name=filename,
             )
             if token:
                 response.set_cookie(token, "done", max_age=600)

diff --git a/superset/importexport/api.py b/superset/importexport/api.py
@@ -87,7 +87,7 @@ def export(self) -> Response:
             buf,
             mimetype="application/zip",
             as_attachment=True,
-            attachment_filename=filename,
+            download_name=filename,
         )
         return response
 

diff --git a/superset/queries/saved_queries/api.py b/superset/queries/saved_queries/api.py
@@ -284,7 +284,7 @@ def export(self, **kwargs: Any) -> Response:
             buf,
             mimetype="application/zip",
             as_attachment=True,
-            attachment_filename=filename,
+            download_name=filename,
         )
         if token:
             response.set_cookie(token, "done", max_age=600)

diff --git a/superset/views/base.py b/superset/views/base.py
@@ -490,7 +490,7 @@ def show_http_exception(ex: HTTPException) -> FlaskResponse:
         and ex.code in {404, 500}
     ):
         path = resource_filename("superset", f"static/assets/{ex.code}.html")
-        return send_file(path, cache_timeout=0), ex.code
+        return send_file(path, max_age=0), ex.code
 
     return json_errors_response(
         errors=[
@@ -512,7 +512,7 @@ def show_command_errors(ex: CommandException) -> FlaskResponse:
     logger.warning("CommandException", exc_info=True)
     if "text/html" in request.accept_mimetypes and not config["DEBUG"]:
         path = resource_filename("superset", "static/assets/500.html")
-        return send_file(path, cache_timeout=0), 500
+        return send_file(path, max_age=0), 500
 
     extra = ex.normalized_messages() if isinstance(ex, CommandInvalidError) else {}
     return json_errors_response(
@@ -534,7 +534,7 @@ def show_unexpected_exception(ex: Exception) -> FlaskResponse:
     logger.exception(ex)
     if "text/html" in request.accept_mimetypes and not config["DEBUG"]:
         path = resource_filename("superset", "static/assets/500.html")
-        return send_file(path, cache_timeout=0), 500
+        return send_file(path, max_age=0), 500
 
     return json_errors_response(
         errors=[