8000 Jorwoods/default to server version (#989) · tableau/server-client-python@b8d616a · GitHub
[go: up one dir, main page]
Skip to content

Commit b8d616a

Browse files
jorwoodsjorwoods
authored
Jorwoods/default to server version (#989)
* Default to using server api version * Skip using server version during tests * Black formatting
1 parent 5b21a5b commit b8d616a

29 files changed

+36
-38
lines changed

‎tableauserverclient/server/endpoint/endpoint.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ 6D40 def _make_request(
6262
if content is not None:
6363
parameters["data"] = content
6464

65-
logger.debug(u"request {}, url: {}".format(method.__name__, url))
65+
logger.debug("request {}, url: {}".format(method.__name__, url))
6666
if content:
67-
logger.debug(u"request content: {}".format(content[:1000]))
67+
logger.debug("request content: {}".format(content[:1000]))
6868

6969
server_response = method(url, **parameters)
7070
self.parent_srv._namespace.detect(server_response.content)
@@ -74,9 +74,7 @@ def _make_request(
7474
# so that we do not attempt to log bytes and other binary data.
7575
if len(server_response.content) > 0 and server_response.encoding:
7676
logger.debug(
77-
u"Server response from {0}:\n\t{1}".format(
78-
url, server_response.content.decode(server_response.encoding)
79-
)
77+
"Server response from {0}:\n\t{1}".format(url, server_response.content.decode(server_response.encoding))
8078
)
8179
return server_response
8280

‎tableauserverclient/server/server.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class PublishMode:
5151
Overwrite = "Overwrite"
5252
CreateNew = "CreateNew"
5353

54-
def __init__(self, server_address, use_server_version=False):
54+
def __init__(self, server_address, use_server_version=True):
5555
self._server_address = server_address
5656
self._auth_token = None
5757
self._site_id = None

‎test/test_auth.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
class AuthTests(unittest.TestCase):
1414
def setUp(self):
15-
self.server = TSC.Server("http://test")
15+
self.server = TSC.Server("http://test", False)
1616
self.baseurl = self.server.auth.baseurl
1717

1818
def test_sign_in(self):

‎test/test_data_acceleration_report.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
class DataAccelerationReportTests(unittest.TestCase):
1212
def setUp(self):
13-
self.server = TSC.Server("http://test")
13+
self.server = TSC.Server("http://test", False)
1414

1515
# Fake signin
1616
self.server._site_id = "dad65087-b08b-4603-af4e-2887b8aafc67"

‎test/test_dataalert.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
class DataAlertTests(unittest.TestCase):
1818
def setUp(self) -> None:
19-
self.server = TSC.Server("http://test")
19+
self.server = TSC.Server("http://test", False)
2020

2121
# Fake signin
2222
self.server._site_id = "dad65087-b08b-4603-af4e-2887b8aafc67"

‎test/test_database.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
class DatabaseTests(unittest.TestCase):
1818
def setUp(self):
19-
self.server = TSC.Server("http://test")
19+
self.server = TSC.Server("http://test", False)
2020
# Fake signin
2121
self.server._site_id = "dad65087-b08b-4603-af4e-2887b8aafc67"
2222
self.server._auth_token = "j80k54ll2lfMZ0tv97mlPvvSCRyD0DOM"

‎test/test_datasource.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
class DatasourceTests(unittest.TestCase):
3232
def setUp(self) -> None:
33-
self.server = TSC.Server("http://test")
33+
self.server = TSC.Server("http://test", False)
3434

3535
# Fake signin
3636
self.server._site_id = "dad65087-b08b-4603-af4e-2887b8aafc67"

‎test/test_favorites.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
class FavoritesTests(unittest.TestCase):
1919
def setUp(self):
20-
self.server = TSC.Server("http://test")
20+
self.server = TSC.Server("http://test", False)
2121
self.server.version = "2.5"
2222

2323
# Fake signin

‎test/test_fileuploads.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
class FileuploadsTests(unittest.TestCase):
1414
def setUp(self):
15-
self.server = Server("http://test")
15+
self.server = Server("http://test", False)
1616

1717
# Fake sign in
1818
self.server._site_id = "dad65087-b08b-4603-af4e-2887b8aafc67"

‎test/test_flow.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
class FlowTests(unittest.TestCase):
1919
def setUp(self) -> None:
20-
self.server = TSC.Server("http://test")
20+
self.server = TSC.Server("http://test", False)
2121

2222
# Fake signin
2323
self.server._site_id = "dad65087-b08b-4603-af4e-2887b8aafc67"

‎test/test_flowruns.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
class FlowRunTests(unittest.TestCase):
1818
def setUp(self) -> None:
19-
self.server = TSC.Server("http://test")
19+
self.server = TSC.Server("http://test", False)
2020

2121
# Fake signin
2222
self.server._site_id = "dad65087-b08b-4603-af4e-2887b8aafc67"

‎test/test_group.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
class GroupTests(unittest.TestCase):
2222
def setUp(self) -> None:
23-
self.server = TSC.Server("http://test")
23+
self.server = TSC.Server("http://test", False)
2424

2525
# Fake signin
2626
self.server._site_id = "dad65087-b08b-4603-af4e-2887b8aafc67"
@@ -194,20 +194,20 @@ def test_create_group(self) -> None:
194194
response_xml = f.read().decode("utf-8")
195195
with requests_mock.mock() as m:
196196
m.post(self.baseurl, text=response_xml)
197-
group_to_create = TSC.GroupItem(u"試供品")
197+
group_to_create = TSC.GroupItem("試供品")
198198
group = self.server.groups.create(group_to_create)
199-
self.assertEqual(group.name, u"試供品")
199+
self.assertEqual(group.name, "試供品")
200200
self.assertEqual(group.id, "3e4a9ea0-a07a-4fe6-b50f-c345c8c81034")
201201

202202
def test_create_ad_group(self) -> None:
203203
with open(CREATE_GROUP_AD, "rb") as f:
204204
response_xml = f.read().decode("utf-8")
205205
with requests_mock.mock() as m:
206206
m.post(self.baseurl, text=response_xml)
207-
group_to_create = TSC.GroupItem(u"試供品")
207+
group_to_create = TSC.GroupItem("試供品")
208208
group_to_create.domain_name = "just-has-to-exist"
209209
group = self.server.groups.create_AD_group(group_to_create, False)
210-
self.assertEqual(group.name, u"試供品")
210+
self.assertEqual(group.name, "試供品")
211211
self.assertEqual(group.license_mode, "onLogin")
212212
self.assertEqual(group.minimum_site_role, "Creator")
213213
self.assertEqual(group.domain_name, "active-directory-domain-name")
@@ -217,7 +217,7 @@ def test_create_group_async(self) -> None:
217217
response_xml = f.read().decode("utf-8")
218218
with requests_mock.mock() as m:
219219
m.post(self.baseurl, text=response_xml)
220-
group_to_create = TSC.GroupItem(u"試供品")
220+
group_to_create = TSC.GroupItem("試供品")
221221
group_to_create.domain_name = "woohoo"
222222
job = self.server.groups.create_AD_group(group_to_create, True)
223223
self.assertEqual(job.mode, "Asynchronous")

‎test/test_job.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
class JobTests(unittest.TestCase):
2020
def setUp(self) -> None:
21-
self.server = TSC.Server("http://test")
21+
self.server = TSC.Server("http://test", False)
2222
self.server.version = "3.1"
2323

2424
# Fake signin

‎test/test_metadata.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
class MetadataTests(unittest.TestCase):
3232
def setUp(self):
33-
self.server = TSC.Server("http://test")
33+
self.server = TSC.Server("http://test", False)
3434
self.baseurl = self.server.metadata.baseurl
3535
self.server.version = "3.5"
3636

‎test/test_pager.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
class PagerTests(unittest.TestCase):
1414
def setUp(self):
15-
self.server = TSC.Server("http://test")
15+
self.server = TSC.Server("http://test", False)
1616

1717
# Fake sign in
1818
self.server._site_id = "dad65087-b08b-4603-af4e-2887b8aafc67"

‎test/test_project.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
class ProjectTests(unittest.TestCase):
2020
def setUp(self) -> None:
21-
self.server = TSC.Server("http://test")
21+
self.server = TSC.Server("http://test", False)
2222

2323
# Fake signin
2424
self.server._site_id = "dad65087-b08b-4603-af4e-2887b8aafc67"

‎test/test_request_option.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
class RequestOptionTests(unittest.TestCase):
1919
def setUp(self):
20-
self.server = TSC.Server("http://test")
20+
self.server = TSC.Server("http://test", False)
2121

2222
# Fake signin
2323
self.server.version = "3.10"

‎test/test_requests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
class RequestTests(unittest.TestCase):
1212
def setUp(self):
13-
self.server = TSC.Server("http://test")
13+
self.server = TSC.Server("http://test", False)
1414

1515
# Fake sign in
1616
self.server._site_id = "dad65087-b08b-4603-af4e-2887b8aafc67"

‎test/test_schedule.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
class ScheduleTests(unittest.TestCase):
2626
def setUp(self) -> None:
27-
self.server = TSC.Server("http://test")
27+
self.server = TSC.Server("http://test", False)
2828

2929
# Fake Signin
3030
self.server._site_id = "dad65087-b08b-4603-af4e-2887b8aafc67"

‎test/test_server_info.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
class ServerInfoTests(unittest.TestCase):
1515
def setUp(self):
16-
self.server = TSC.Server("http://test")
16+
self.server = TSC.Server("http://test", False)
1717
self.baseurl = self.server.server_info.baseurl
1818
self.server.version = "2.4"
1919

‎test/test_site.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
class SiteTests(unittest.TestCase):
1616
def setUp(self) -> None:
17-
self.server = TSC.Server("http://test")
17+
self.server = TSC.Server("http://test", False)
1818
self.server.version = "3.10"
1919

2020
# Fake signin

‎test/test_sort.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
class SortTests(unittest.TestCase):
99
def setUp(self):
10-
self.server = TSC.Server("http://test")
10+
self.server = TSC.Server("http://test", False)
1111
self.server.version = "3.10"
1212
self.server._site_id = "dad65087-b08b-4603-af4e-2887b8aafc67"
1313
self.server._auth_token = "j80k54ll2lfMZ0tv97mlPvvSCRyD0DOM"

‎test/test_subscription.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
class SubscriptionTests(unittest.TestCase):
1414
def setUp(self) -> None:
15-
self.server = TSC.Server("http://test")
15+
self.server = TSC.Server("http://test", False)
1616
self.server.version = "2.6"
1717

1818
# Fake Signin

‎test/test_table.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
class TableTests(unittest.TestCase):
1616
def setUp(self):
17-
self.server = TSC.Server("http://test")
17+
self.server = TSC.Server("http://test", False)
1818

1919
# Fake signin
2020
self.server._site_id = "dad65087-b08b-4603-af4e-2887b8aafc67"

‎test/test_task.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
class TaskTests(unittest.TestCase):
1919
def setUp(self):
20-
self.server = TSC.Server("http://test")
20+
self.server = TSC.Server("http://test", False)
2121
self.server.version = "3.8"
2222

2323
# Fake Signin

‎test/test_user.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
class UserTests(unittest.TestCase):
2020
def setUp(self) -> None:
21-
self.server = TSC.Server("http://test")
21+
self.server = TSC.Server("http://test", False)
2222

2323
# Fake signin
2424
self.server._site_id = "dad65087-b08b-4603-af4e-2887b8aafc67"

‎test/test_view.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
class ViewTests(unittest.TestCase):
2424
def setUp(self):
25-
self.server = TSC.Server("http://test")
25+
self.server = TSC.Server("http://test", False)
2626
self.server.version = "3.2"
2727

2828
# Fake sign in

‎test/test_webhook.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
class WebhookTests(unittest.TestCase):
1717
def setUp(self) -> None:
18-
self.server = TSC.Server("http://test")
18+
self.server = TSC.Server("http://test", False)
1919
self.server.version = "3.6"
2020

2121
# Fake signin

‎test/test_workbook.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
class WorkbookTests(unittest.TestCase):
4444
def setUp(self) -> None:
45-
self.server = TSC.Server("http://test")
45+
self.server = TSC.Server("http://test", False)
4646

4747
# Fake sign in
4848
self.server._site_id = "dad65087-b08b-4603-af4e-2887b8aafc67"

0 commit comments

Comments
 (0)
0