Add version awareness to site create/update methods (#1068)

* Update sites requests for Breaking change in 3.10: flowsEnabled removed, flowsEditingEnabled and flowsSchedulingEnabled added

Author: jacalata

tableauserverclient/server/endpoint/exceptions.py

@@ -6,34 +6,29 @@ class TableauError(Exception):
 
 
 class ServerResponseError(TableauError):
-    def __init__(self, code, summary, detail, url=None):
+    def __init__(self, code, summary, detail):
         self.code = code
         self.summary = summary
         self.detail = detail
-        self.url = url
         super(ServerResponseError, self).__init__(str(self))
 
     def __str__(self):
         return "\n\n\t{0}: {1}\n\t\t{2}".format(self.code, self.summary, self.detail)
 
     @classmethod
-    def from_response(cls, resp, ns, url=None):
+    def from_response(cls, resp, ns):
         # Check elements exist before .text
         parsed_response = fromstring(resp)
-        try:
-            error_response = cls(
-                parsed_response.find("t:error", namespaces=ns).get("code", ""),
-                parsed_response.find(".//t:summary", namespaces=ns).text,
-                parsed_response.find(".//t:detail", namespaces=ns).text,
-                url,
-            )
-        except Exception as e:
-            raise NonXMLResponseError(resp)
+        error_response = cls(
+            parsed_response.find("t:error", namespaces=ns).get("code", ""),
+            parsed_response.find(".//t:summary", namespaces=ns).text,
+            parsed_response.find(".//t:detail", namespaces=ns).text,
+        )
         return error_response
 
 
 class InternalServerError(TableauError):
-    def __init__(self, server_response, request_url: str = None):
+    def __init__(self, server_response, request_url):
         self.code = server_response.status_code
         self.content = server_response.content
         self.url = request_url or "server"

tableauserverclient/server/request_factory.py

@@ -25,6 +25,7 @@
     from ..models import ConnectionItem
     from ..models import SiteItem
     from ..models import ProjectItem
+    from tableauserverclient.server import Server
 
 
 def _add_multipart(parts: Dict) -> Tuple[Any, str]:

tableauserverclient/server/server.py

@@ -1,8 +1,7 @@
-import requests
+from distutils.version import LooseVersion as Version
 import urllib3
-
 from defusedxml.ElementTree import fromstring
-from packaging.version import Version
+
 from .endpoint import (
     Sites,
     Views,
@@ -36,11 +35,9 @@
 from .exceptions import NotSignedInError
 from ..namespace import Namespace
 
+import requests
 
-from .._version import get_versions
-
-__TSC_VERSION__ = get_versions()["version"]
-del get_versions
+from distutils.version import LooseVersion as Version
 
 _PRODUCT_TO_REST_VERSION = {
     "10.0": "2.3",
@@ -49,9 +46,6 @@
     "9.1": "2.0",
     "9.0": "2.0",
 }
-minimum_supported_server_version = "2.3"
-default_server_version = "2.3"
-client_version_header = "X-TableauServerClient-Version"
 
 
 class Server(object):
@@ -68,7 +62,7 @@ def __init__(self, server_address, use_server_version=False, http_options=None):
         self._session = requests.Session()
         self._http_options = dict()
 
-        self.version = default_server_version
+        self.version = "2.3"
         self.auth = Auth(self)
         self.views = Views(self)
         self.users = Users(self)
@@ -95,10 +89,8 @@ def __init__(self, server_address, use_server_version=False, http_options=None):
         self.flow_runs = FlowRuns(self)
         self.metrics = Metrics(self)
 
-        # must set this before calling use_server_version, because that's a server call
         if http_options:
             self.add_http_options(http_options)
-            self.add_http_version_header()
 
         if use_server_version:
             self.use_server_version()
@@ -108,13 +100,8 @@ def add_http_options(self, options_dict):
         if options_dict.get("verify") == False:
             urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 
-    def add_http_version_header(self):
-        if not self._http_options[client_version_header]:
-            self._http_options.update({client_version_header: __TSC_VERSION__})
-
     def clear_http_options(self):
         self._http_options = dict()
-        self.add_http_version_header()
 
     def _clear_auth(self):
         self._site_id = None