8000 Jorwoods/default to server version by jorwoods · Pull Request #989 · tableau/server-client-python · GitHub
[go: up one dir, main page]

Skip to content

Jorwoods/default to server version #989

New issue 8000

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions tableauserverclient/server/endpoint/endpoint.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion tableauserverclient/server/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/test_auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion test/test_data_acceleration_report.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion test/test_dataalert.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion test/test_database.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion test/test_datasource.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion test/test_favorites.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/test_fileuploads.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion test/test_flow.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion test/test_flowruns.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
12 changes: 6 additions & 6 deletions test/test_group.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -194,20 +194,20 @@ 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:
with open(CREATE_GROUP_AD, "rb") as f:
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")
Expand All @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion test/test_job.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/test_metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion test/test_pager.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion test/test_project.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion test/test_request_option.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion test/test_requests.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion test/test_schedule.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion test/test_server_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion test/test_site.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/test_sort.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion test/test_subscription.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/test_table.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion test/test_task.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/test_user.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion test/test_view.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/test_webhook.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/test_workbook.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
0