Merge pull request #1346 from markm-io/master

CGI Removal

Author: jacalata

tableauserverclient/server/endpoint/datasources_endpoint.py

@@ -1,4 +1,4 @@
-import cgi
+from email.message import Message
 import copy
 import json
 import io
@@ -437,14 +437,16 @@ def download_revision(
             url += "?includeExtract=False"
 
         with closing(self.get_request(url, parameters={"stream": True})) as server_response:
-            _, params = cgi.parse_header(server_response.headers["Content-Disposition"])
+            m = Message()
+            m["Content-Disposition"] = server_response.headers["Content-Disposition"]
+            params = m.get_filename(failobj="")
             if isinstance(filepath, io_types_w):
                 for chunk in server_response.iter_content(1024):  # 1KB
                     filepath.write(chunk)
                 return_path = filepath
             else:
                 params = fix_filename(params)
-                filename = to_filename(os.path.basename(params["filename"]))
+                filename = to_filename(os.path.basename(params))
                 download_path = make_download_path(filepath, filename)
                 with open(download_path, "wb") as f:
                     for chunk in server_response.iter_content(1024):  # 1KB

tableauserverclient/server/endpoint/flows_endpoint.py

@@ -1,4 +1,4 @@
-import cgi
+from email.message import Message
 import copy
 import io
 import logging
@@ -120,14 +120,16 @@ def download(self, flow_id: str, filepath: Optional[PathOrFileW] = None) -> Path
         url = "{0}/{1}/content".format(self.baseurl, flow_id)
 
         with closing(self.get_request(url, parameters={"stream": True})) as server_response:
-            _, params = cgi.parse_header(server_response.headers["Content-Disposition"])
+            m = Message()
+            m["Content-Disposition"] = server_response.headers["Content-Disposition"]
+            params = m.get_filename(failobj="")
             if isinstance(filepath, io_types_w):
                 for chunk in server_response.iter_content(1024):  # 1KB
                     filepath.write(chunk)
                 return_path = filepath
             else:
                 params = fix_filename(params)
-                filename = to_filename(os.path.basename(params["filename"]))
+                filename = to_filename(os.path.basename(params))
                 download_path = make_download_path(filepath, filename)
                 with open(download_path, "wb") as f:
                     for chunk in server_response.iter_content(1024):  # 1KB

tableauserverclient/server/endpoint/workbooks_endpoint.py

@@ -1,4 +1,4 @@
-import cgi
+from email.message import Message
 import copy
 import io
 import logging
@@ -483,14 +483,16 @@ def download_revision(
             url += "?includeExtract=False"
 
         with closing(self.get_request(url, parameters={"stream": True})) as server_response:
-            _, params = cgi.parse_header(server_response.headers["Content-Disposition"])
+            m = Message()
+            m["Content-Disposition"] = server_response.headers["Content-Disposition"]
+            params = m.get_filename(failobj="")
             if isinstance(filepath, io_types_w):
                 for chunk in server_response.iter_content(1024):  # 1KB
                     filepath.write(chunk)
                 return_path = filepath
             else:
                 params = fix_filename(params)
-                filename = to_filename(os.path.basename(params["filename"]))
+                filename = to_filename(os.path.basename(params))
                 download_path = make_download_path(filepath, filename)
                 with open(download_path, "wb") as f:
                     for chunk in server_response.iter_content(1024):  # 1KB