diff --git a/tableauserverclient/server/endpoint/endpoint.py b/tableauserverclient/server/endpoint/endpoint.py index 73e25cf4d..7e37220a5 100644 --- a/tableauserverclient/server/endpoint/endpoint.py +++ b/tableauserverclient/server/endpoint/endpoint.py @@ -62,9 +62,9 @@ def _make_request( if content is not None: parameters["data"] = content - logger.debug(u"request {}, url: {}".format(method.__name__, url)) + logger.debug("request {}, url: {}".format(method.__name__, url)) if content: - logger.debug(u"request content: {}".format(content[:1000])) + logger.debug("request content: {}".format(content[:1000])) server_response = method(url, **parameters) self.parent_srv._namespace.detect(server_response.content) @@ -74,9 +74,7 @@ def _make_request( # so that we do not attempt to log bytes and other binary data. if len(server_response.content) > 0 and server_response.encoding: logger.debug( - u"Server response from {0}:\n\t{1}".format( - url, server_response.content.decode(server_response.encoding) - ) + "Server response from {0}:\n\t{1}".format(url, server_response.content.decode(server_response.encoding)) ) return server_response diff --git a/tableauserverclient/server/server.py b/tableauserverclient/server/server.py index c4c635a91..69c7c3589 100644 --- a/tableauserverclient/server/server.py +++ b/tableauserverclient/server/server.py @@ -51,7 +51,7 @@ class PublishMode: Overwrite = "Overwrite" CreateNew = "CreateNew" - def __init__(self, server_address, use_server_version=False): + def __init__(self, server_address, use_server_version=True): self._server_address = server_address self._auth_token = None self._site_id = None diff --git a/test/test_auth.py b/test/test_auth.py index ff757909e..5b78c34dc 100644 --- a/test/test_auth.py +++ b/test/test_auth.py @@ -12,7 +12,7 @@ class AuthTests(unittest.TestCase): def setUp(self): - self.server = TSC.Server("http://test") + self.server = TSC.Server("http://test", False) self.baseurl = self.server.auth.baseurl def test_sign_in(self): diff --git a/test/test_data_acceleration_report.py b/test/test_data_acceleration_report.py index d3cf96db1..0c2ddb61f 100644 --- a/test/test_data_acceleration_report.py +++ b/test/test_data_acceleration_report.py @@ -10,7 +10,7 @@ class DataAccelerationReportTests(unittest.TestCase): def setUp(self): - self.server = TSC.Server("http://test") + self.server = TSC.Server("http://test", False) # Fake signin self.server._site_id = "dad65087-b08b-4603-af4e-2887b8aafc67" diff --git a/test/test_dataalert.py b/test/test_dataalert.py index 059046123..841f7a059 100644 --- a/test/test_dataalert.py +++ b/test/test_dataalert.py @@ -16,7 +16,7 @@ class DataAlertTests(unittest.TestCase): def setUp(self) -> None: - self.server = TSC.Server("http://test") + self.server = TSC.Server("http://test", False) # Fake signin self.server._site_id = "dad65087-b08b-4603-af4e-2887b8aafc67" diff --git a/test/test_database.py b/test/test_database.py index 8e27ccf52..3fe089043 100644 --- a/test/test_database.py +++ b/test/test_database.py @@ -16,7 +16,7 @@ class DatabaseTests(unittest.TestCase): def setUp(self): - self.server = TSC.Server("http://test") + self.server = TSC.Server("http://test", False) # Fake signin self.server._site_id = "dad65087-b08b-4603-af4e-2887b8aafc67" self.server._auth_token = "j80k54ll2lfMZ0tv97mlPvvSCRyD0DOM" diff --git a/test/test_datasource.py b/test/test_datasource.py index 67b7b579c..9d0d05570 100644 --- a/test/test_datasource.py +++ b/test/test_datasource.py @@ -30,7 +30,7 @@ class DatasourceTests(unittest.TestCase): def setUp(self) -> None: - self.server = TSC.Server("http://test") + self.server = TSC.Server("http://test", False) # Fake signin self.server._site_id = "dad65087-b08b-4603-af4e-2887b8aafc67" diff --git a/test/test_favorites.py b/test/test_favorites.py index cd019fe75..7a4524291 100644 --- a/test/test_favorites.py +++ b/test/test_favorites.py @@ -17,7 +17,7 @@ class FavoritesTests(unittest.TestCase): def setUp(self): - self.server = TSC.Server("http://test") + self.server = TSC.Server("http://test", False) self.server.version = "2.5" # Fake signin diff --git a/test/test_fileuploads.py b/test/test_fileuploads.py index cd94c1ece..c3157224c 100644 --- a/test/test_fileuploads.py +++ b/test/test_fileuploads.py @@ -12,7 +12,7 @@ class FileuploadsTests(unittest.TestCase): def setUp(self): - self.server = Server("http://test") + self.server = Server("http://test", False) # Fake sign in self.server._site_id = "dad65087-b08b-4603-af4e-2887b8aafc67" diff --git a/test/test_flow.py b/test/test_flow.py index bced0884b..555430185 100644 --- a/test/test_flow.py +++ b/test/test_flow.py @@ -17,7 +17,7 @@ class FlowTests(unittest.TestCase): def setUp(self) -> None: - self.server = TSC.Server("http://test") + self.server = TSC.Server("http://test", False) # Fake signin self.server._site_id = "dad65087-b08b-4603-af4e-2887b8aafc67" diff --git a/test/test_flowruns.py b/test/test_flowruns.py index 38b156ae8..1f832ce60 100644 --- a/test/test_flowruns.py +++ b/test/test_flowruns.py @@ -16,7 +16,7 @@ class FlowRunTests(unittest.TestCase): def setUp(self) -> None: - self.server = TSC.Server("http://test") + self.server = TSC.Server("http://test", False) # Fake signin self.server._site_id = "dad65087-b08b-4603-af4e-2887b8aafc67" diff --git a/test/test_group.py b/test/test_group.py index 4be6da53c..1adbaae8d 100644 --- a/test/test_group.py +++ b/test/test_group.py @@ -20,7 +20,7 @@ class GroupTests(unittest.TestCase): def setUp(self) -> None: - self.server = TSC.Server("http://test") + self.server = TSC.Server("http://test", False) # Fake signin self.server._site_id = "dad65087-b08b-4603-af4e-2887b8aafc67" @@ -194,9 +194,9 @@ def test_create_group(self) -> None: response_xml = f.read().decode("utf-8") with requests_mock.mock() as m: m.post(self.baseurl, text=response_xml) - group_to_create = TSC.GroupItem(u"試供品") + group_to_create = TSC.GroupItem("試供品") group = self.server.groups.create(group_to_create) - self.assertEqual(group.name, u"試供品") + self.assertEqual(group.name, "試供品") self.assertEqual(group.id, "3e4a9ea0-a07a-4fe6-b50f-c345c8c81034") def test_create_ad_group(self) -> None: @@ -204,10 +204,10 @@ def test_create_ad_group(self) -> None: response_xml = f.read().decode("utf-8") with requests_mock.mock() as m: m.post(self.baseurl, text=response_xml) - group_to_create = TSC.GroupItem(u"試供品") + group_to_create = TSC.GroupItem("試供品") group_to_create.domain_name = "just-has-to-exist" group = self.server.groups.create_AD_group(group_to_create, False) - self.assertEqual(group.name, u"試供品") + self.assertEqual(group.name, "試供品") self.assertEqual(group.license_mode, "onLogin") self.assertEqual(group.minimum_site_role, "Creator") self.assertEqual(group.domain_name, "active-directory-domain-name") @@ -217,7 +217,7 @@ def test_create_group_async(self) -> None: response_xml = f.read().decode("utf-8") with requests_mock.mock() as m: m.post(self.baseurl, text=response_xml) - group_to_create = TSC.GroupItem(u"試供品") + group_to_create = TSC.GroupItem("試供品") group_to_create.domain_name = "woohoo" job = self.server.groups.create_AD_group(group_to_create, True) self.assertEqual(job.mode, "Asynchronous") diff --git a/test/test_job.py b/test/test_job.py index 71c48d18d..d47315100 100644 --- a/test/test_job.py +++ b/test/test_job.py @@ -18,7 +18,7 @@ class JobTests(unittest.TestCase): def setUp(self) -> None: - self.server = TSC.Server("http://test") + self.server = TSC.Server("http://test", False) self.server.version = "3.1" # Fake signin diff --git a/test/test_metadata.py b/test/test_metadata.py index 3510128c8..6e9eb4092 100644 --- a/test/test_metadata.py +++ b/test/test_metadata.py @@ -30,7 +30,7 @@ class MetadataTests(unittest.TestCase): def setUp(self): - self.server = TSC.Server("http://test") + self.server = TSC.Server("http://test", False) self.baseurl = self.server.metadata.baseurl self.server.version = "3.5" diff --git a/test/test_pager.py b/test/test_pager.py index 21b49bcf0..aa66aff46 100644 --- a/test/test_pager.py +++ b/test/test_pager.py @@ -12,7 +12,7 @@ class PagerTests(unittest.TestCase): def setUp(self): - self.server = TSC.Server("http://test") + self.server = TSC.Server("http://test", False) # Fake sign in self.server._site_id = "dad65087-b08b-4603-af4e-2887b8aafc67" diff --git a/test/test_project.py b/test/test_project.py index 76b219ed2..4de616078 100644 --- a/test/test_project.py +++ b/test/test_project.py @@ -18,7 +18,7 @@ class ProjectTests(unittest.TestCase): def setUp(self) -> None: - self.server = TSC.Server("http://test") + self.server = TSC.Server("http://test", False) # Fake signin self.server._site_id = "dad65087-b08b-4603-af4e-2887b8aafc67" diff --git a/test/test_request_option.py b/test/test_request_option.py index fba1e0f68..8c91ac407 100644 --- a/test/test_request_option.py +++ b/test/test_request_option.py @@ -17,7 +17,7 @@ class RequestOptionTests(unittest.TestCase): def setUp(self): - self.server = TSC.Server("http://test") + self.server = TSC.Server("http://test", False) # Fake signin self.server.version = "3.10" diff --git a/test/test_requests.py b/test/test_requests.py index d9dfc3ea2..80f9037c3 100644 --- a/test/test_requests.py +++ b/test/test_requests.py @@ -10,7 +10,7 @@ class RequestTests(unittest.TestCase): def setUp(self): - self.server = TSC.Server("http://test") + self.server = TSC.Server("http://test", False) # Fake sign in self.server._site_id = "dad65087-b08b-4603-af4e-2887b8aafc67" diff --git a/test/test_schedule.py b/test/test_schedule.py index 5b3c1177e..1162ec3bb 100644 --- a/test/test_schedule.py +++ b/test/test_schedule.py @@ -24,7 +24,7 @@ class ScheduleTests(unittest.TestCase): def setUp(self) -> None: - self.server = TSC.Server("http://test") + self.server = TSC.Server("http://test", False) # Fake Signin self.server._site_id = "dad65087-b08b-4603-af4e-2887b8aafc67" diff --git a/test/test_server_info.py b/test/test_server_info.py index 08565f6d5..7ad8842b0 100644 --- a/test/test_server_info.py +++ b/test/test_server_info.py @@ -13,7 +13,7 @@ class ServerInfoTests(unittest.TestCase): def setUp(self): - self.server = TSC.Server("http://test") + self.server = TSC.Server("http://test", False) self.baseurl = self.server.server_info.baseurl self.server.version = "2.4" diff --git a/test/test_site.py b/test/test_site.py index b8939651c..6fe7102f1 100644 --- a/test/test_site.py +++ b/test/test_site.py @@ -14,7 +14,7 @@ class SiteTests(unittest.TestCase): def setUp(self) -> None: - self.server = TSC.Server("http://test") + self.server = TSC.Server("http://test", False) self.server.version = "3.10" # Fake signin diff --git a/test/test_sort.py b/test/test_sort.py index 105240fba..d8041ab6d 100644 --- a/test/test_sort.py +++ b/test/test_sort.py @@ -7,7 +7,7 @@ class SortTests(unittest.TestCase): def setUp(self): - self.server = TSC.Server("http://test") + self.server = TSC.Server("http://test", False) self.server.version = "3.10" self.server._site_id = "dad65087-b08b-4603-af4e-2887b8aafc67" self.server._auth_token = "j80k54ll2lfMZ0tv97mlPvvSCRyD0DOM" diff --git a/test/test_subscription.py b/test/test_subscription.py index 9114d9890..4a2a00577 100644 --- a/test/test_subscription.py +++ b/test/test_subscription.py @@ -12,7 +12,7 @@ class SubscriptionTests(unittest.TestCase): def setUp(self) -> None: - self.server = TSC.Server("http://test") + self.server = TSC.Server("http://test", False) self.server.version = "2.6" # Fake Signin diff --git a/test/test_table.py b/test/test_table.py index f03b9a522..093ccfcb6 100644 --- a/test/test_table.py +++ b/test/test_table.py @@ -14,7 +14,7 @@ class TableTests(unittest.TestCase): def setUp(self): - self.server = TSC.Server("http://test") + self.server = TSC.Server("http://test", False) # Fake signin self.server._site_id = "dad65087-b08b-4603-af4e-2887b8aafc67" diff --git a/test/test_task.py b/test/test_task.py index 329caf2e7..912e8a749 100644 --- a/test/test_task.py +++ b/test/test_task.py @@ -17,7 +17,7 @@ class TaskTests(unittest.TestCase): def setUp(self): - self.server = TSC.Server("http://test") + self.server = TSC.Server("http://test", False) self.server.version = "3.8" # Fake Signin diff --git a/test/test_user.py b/test/test_user.py index 8d0e98a57..1927426d7 100644 --- a/test/test_user.py +++ b/test/test_user.py @@ -18,7 +18,7 @@ class UserTests(unittest.TestCase): def setUp(self) -> None: - self.server = TSC.Server("http://test") + self.server = TSC.Server("http://test", False) # Fake signin self.server._site_id = "dad65087-b08b-4603-af4e-2887b8aafc67" diff --git a/test/test_view.py b/test/test_view.py index 668eb9c3a..311377720 100644 --- a/test/test_view.py +++ b/test/test_view.py @@ -22,7 +22,7 @@ class ViewTests(unittest.TestCase): def setUp(self): - self.server = TSC.Server("http://test") + self.server = TSC.Server("http://test", False) self.server.version = "3.2" # Fake sign in diff --git a/test/test_webhook.py b/test/test_webhook.py index c5f089204..a8423bf42 100644 --- a/test/test_webhook.py +++ b/test/test_webhook.py @@ -15,7 +15,7 @@ class WebhookTests(unittest.TestCase): def setUp(self) -> None: - self.server = TSC.Server("http://test") + self.server = TSC.Server("http://test", False) self.server.version = "3.6" # Fake signin diff --git a/test/test_workbook.py b/test/test_workbook.py index cf6bce1f3..807168581 100644 --- a/test/test_workbook.py +++ b/test/test_workbook.py @@ -42,7 +42,7 @@ class WorkbookTests(unittest.TestCase): def setUp(self) -> None: - self.server = TSC.Server("http://test") + self.server = TSC.Server("http://test", False) # Fake sign in self.server._site_id = "dad65087-b08b-4603-af4e-2887b8aafc67"