8000 renamed all instances of the word, 'type' (#18) · miturchi/server-client-python@fa97e62 · GitHub
[go: up one dir, main page]
Skip to content

Commit fa97e62

Browse files
shinchrisshinchris
authored
renamed all instances of the word, 'type' (tableau#18)
1 parent cb179df commit fa97e62

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

‎tableauserverapi/models/connection_item.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ def __init__(self):
77
self._datasource_id = None
88
self._datasource_name = None
99
self._id = None
10-
self._type = None
10+
self._connection_type = None
1111
self.embed_password = None
1212
self.password = None
1313
self.server_address = None
@@ -27,8 +27,8 @@ def id(self):
2727
return self._id
2828

2929
@property
30-
def type(self):
31-
return self._type
30+
def connection_type(self):
31+
return self._connection_type
3232

3333
@classmethod
3434
def from_response(cls, resp):
@@ -38,7 +38,7 @@ def from_response(cls, resp):
3838
for connection_xml in all_connection_xml:
3939
connection_item = cls()
4040
connection_item._id = connection_xml.get('id', None)
41-
connection_item._type = connection_xml.get('type', None)
41+
connection_item._connection_type = connection_xml.get('type', None)
4242
connection_item.server_address = connection_xml.get('serverAddress', None)
4343
connection_item.server_port = connection_xml.get('serverPort', None)
4444
connection_item.username = connection_xml.get('userName', None)

‎tableauserverapi/models/datasource_item.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def __init__(self, project_id, name=None):
1313
self._project_id = None
1414
self._project_name = None
1515
self._tags = set()
16-
self._type = None
16+
self._datasource_type = None
1717
self._updated_at = None
1818
self.name = name
1919
self.owner_id = None
@@ -61,8 +61,8 @@ def tags(self):
6161
return self._tags
6262

6363
@property
64-
def type(self):
65-
return self._type
64+
def datasource_type(self):
65+
return self._datasource_type
6666

6767
@property
6868
def updated_at(self):
@@ -79,14 +79,14 @@ def _parse_common_tags(self, datasource_xml):
7979
self._set_values(None, None, None, None, None, updated_at, None, project_id, project_name, owner_id)
8080
return self
8181

82-
def _set_values(self, id, name, type, content_url, created_at,
82+
def _set_values(self, id, name, datasource_type, content_url, created_at,
8383
updated_at, tags, project_id, project_name, owner_id):
8484
if id is not None:
8585
self._id = id
8686
if name:
8787
self.name = name
88-
if type:
89-
self._type = type
88+
if datasource_type:
89+
self._datasource_type = datasource_type
9090
if content_url:
9191
10000 self._content_url = content_url
9292
if created_at:
@@ -109,10 +109,10 @@ def from_response(cls, resp):
109109
all_datasource_xml = parsed_response.findall('.//t:datasource', namespaces=NAMESPACE)
110110

111111
for datasource_xml in all_datasource_xml:
112-
(id, name, type, content_url, created_at, updated_at,
112+
(id, name, datasource_type, content_url, created_at, updated_at,
113113
tags, project_id, project_name, owner_id) = cls._parse_element(datasource_xml)
114114
datasource_item = cls(project_id)
115-
datasource_item._set_values(id, name, type, content_url, created_at, updated_at,
115+
datasource_item._set_values(id, name, datasource_type, content_url, created_at, updated_at,
116116
tags, None, project_name, owner_id)
117117
all_datasource_items.append(datasource_item)
118118
return all_datasource_items
@@ -121,7 +121,7 @@ def from_response(cls, resp):
121121
def _parse_element(datasource_xml):
122122
id = datasource_xml.get('id', None)
123123
name = datasource_xml.get('name', None)
124-
type = datasource_xml.get('type', None)
124+
datasource_type = datasource_xml.get('type', None)
125125
content_url = datasource_xml.get('contentUrl', None)
126126
created_at = datasource_xml.get('createdAt', None)
127127
updated_at = datasource_xml.get('updatedAt', None)
@@ -143,4 +143,4 @@ def _parse_element(datasource_xml):
143143
if owner_elem is not None:
144144
owner_id = owner_elem.get('id', None)
145145

146-
return id, name, type, content_url, created_at, updated_at, tags, project_id, project_name, owner_id
146+
return id, name, datasource_type, content_url, created_at, updated_at, tags, project_id, project_name, owner_id

‎test/test_datasource.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def test_get(self):
3131

3232
self.assertEqual(2, pagination_item.total_available)
3333
self.assertEqual('e76a1461-3b1d-4588-bf1b-17551a879ad9', all_datasources[0].id)
34-
self.assertEqual('dataengine', all_datasources[0].type)
34+
self.assertEqual('dataengine', all_datasources[0].datasource_type)
3535
self.assertEqual('SampleDS', all_datasources[0].content_url)
3636
self.assertEqual('2016-08-11T21:22:40Z', all_datasources[0].created_at)
3737
self.assertEqual('2016-08-11T21:34:17Z', all_datasources[0].updated_at)
@@ -41,7 +41,7 @@ def test_get(self):
4141
self.assertEqual('5de011f8-5aa9-4d5b-b991-f462c8dd6bb7', all_datasources[0].owner_id)
4242

4343
self.assertEqual('9dbd2263-16b5-46e1-9c43-a76bb8ab65fb', all_datasources[1].id)
44-
self.assertEqual('dataengine', all_datasources[1].type)
44+
self.assertEqual('dataengine', all_datasources[1].datasource_type)
4545
self.assertEqual('Sampledatasource', all_datasources[1].content_url)
4646
self.assertEqual('2016-08-04T21:31:55Z', all_datasources[1].created_at)
4747
self.assertEqual('2016-08-04T21:31:55Z', all_datasources[1].updated_at)
@@ -73,7 +73,7 @@ def test_get_by_id(self):
7373
single_datasource = self.server.datasources.get_by_id('9dbd2263-16b5-46e1-9c43-a76bb8ab65fb')
7474

7575
self.assertEqual('9dbd2263-16b5-46e1-9c43-a76bb8ab65fb', single_datasource.id)
76-
self.assertEqual('dataengine', single_datasource.type)
76+
self.assertEqual('dataengine', single_datasource.datasource_type)
7777
self.assertEqual('Sampledatasource', single_datasource.content_url)
7878
self.assertEqual('2016-08-04T21:31:55Z', single_datasource.created_at)
7979
self.assertEqual('2016-08-04T21:31:55Z', single_datasource.updated_at)
@@ -124,7 +124,7 @@ def test_publish(self):
124124
self.assertEqual('e76a1461-3b1d-4588-bf1b-17551a879ad9', new_datasource.id)
125125
self.assertEqual('SampleDS', new_datasource.name)
126126
self.assertEqual('SampleDS', new_datasource.content_url)
127-
self.assertEqual('dataengine', new_datasource.type)
127+
self.assertEqual('dataengine', new_datasource.datasource_type)
128128
self.assertEqual('2016-08-11T21:22:40Z', new_datasource.created_at)
129129
self.assertEqual('2016-08-17T23:37:08Z', new_datasource.updated_at)
130130
self.assertEqual('ee8c6e70-43b6-11e6-af4f-f7b0d8e20760', new_datasource.project_id)

‎test/test_workbook.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ def test_populate_connections(self):
208208
self.server.workbooks.populate_connections(single_workbook)
209209

210210
self.assertEqual('37ca6ced-58d7-4dcf-99dc-f0a85223cbef', single_workbook.connections[0].id)
211-
self.assertEqual('dataengine', single_workbook.connections[0].type)
211+
self.assertEqual('dataengine', single_workbook.connections[0].connection_type)
212212
self.assertEqual('4506225a-0d32-4ab1-82d3-c24e85f7afba', single_workbook.connections[0].datasource_id)
213213
self.assertEqual('World Indicators', single_workbook.connections[0].datasource_name)
214214

0 commit comments

Comments
 (0)
0