8000 Responding to CR feedback: · SnarkyPapi/server-client-python@bd142f6 · GitHub
[go: up one dir, main page]
Skip to content
8000

Commit bd142f6

Browse files
lbrendanlRussell Hay
lbrendanl
authored and
Russell Hay
committed
Responding to CR feedback:
- Removed unused getter/setter for _initial_tags - Designated ResourceTagger as for internal use.
1 parent f1987e1 commit bd142f6

File tree

7 files changed

+11
-29
lines changed

7 files changed

+11
-29
lines changed

‎tableauserverclient/models/datasource_item.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,6 @@ def datasource_type(self):
6262
def updated_at(self):
6363
return self._updated_at
6464

65-
def _get_initial_tags(self):
66-
return self._initial_tags
67-
68-
def _set_initial_tags(self, initial_tags):
69-
self._initial_tags = initial_tags
70-
7165
def _set_connections(self, connections):
7266
self._connections = connections
7367

‎tableauserverclient/models/view_item.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,6 @@ def total_views(self):
5151
def workbook_id(self):
5252
return self._workbook_id
5353

54-
def _get_initial_tags(self):
55-
return self._initial_tags
56-
57-
def _set_initial_tags(self, initial_tags):
58-
self._initial_tags = initial_tags
59-
6054
@classmethod
6155
def from_response(cls, resp, workbook_id=''):
6256
return cls.from_xml_element(ET.fromstring(resp), workbook_id)

‎tableauserverclient/models/workbook_item.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,6 @@ def views(self):
8989
raise UnpopulatedPropertyError(error)
9090
return self._views
9191

92-
def _get_initial_tags(self):
93-
return self._initial_tags
94-
95-
def _set_initial_tags(self, initial_tags):
96-
self._initial_tags = initial_tags
97-
9892
def _set_connections(self, connections):
9993
self._connections = connections
10094

‎tableauserverclient/server/endpoint/datasources_endpoint.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from .endpoint import Endpoint, api, parameter_added_in
22
from .exceptions import MissingRequiredFieldError
33
from .fileuploads_endpoint import Fileuploads
4-
from .resource_tagger import ResourceTagger
4+
from .resource_tagger import _ResourceTagger
55
from .. import RequestFactory, DatasourceItem, PaginationItem, ConnectionItem
66
from ...filesys_helpers import to_filename
77
from ...models.tag_item import TagItem
@@ -22,7 +22,7 @@
2222
class Datasources(Endpoint):
2323
def __init__(self, parent_srv):
2424
super(Datasources, self).__init__(parent_srv)
25-
self._resource_tagger = ResourceTagger(parent_srv)
25+
self._resource_tagger = _ResourceTagger(parent_srv)
2626

2727
@property
2828
def baseurl(self):
@@ -104,7 +104,7 @@ def update(self, datasource_item):
104104
error = 'Datasource item missing ID. Datasource must be retrieved from server first.'
105105
raise MissingRequiredFieldError(error)
106106

107-
self._resource_tagger._update_tags(self.baseurl, datasource_item)
107+
self._resource_tagger.update_tags(self.baseurl, datasource_item)
108108

109109
# Update the datasource itself
110110
url = "{0}/{1}".format(self.baseurl, datasource_item.id)

‎tableauserverclient/server/endpoint/resource_tagger.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
logger = logging.getLogger('tableau.endpoint.resource_tagger')
99

1010

11-
class ResourceTagger(Endpoint):
11+
class _ResourceTagger(Endpoint):
1212
# Add new tags to resource
1313
def _add_tags(self, baseurl, resource_id, tag_set):
1414
url = "{0}/{1}/tags".format(baseurl, resource_id)
@@ -35,7 +35,7 @@ def _delete_tag(self, baseurl, resource_id, tag_name):
3535
raise EndpointUnavailableError(error)
3636

3737
# Remove and add tags to match the resource item's tag set
38-
def _update_tags(self, baseurl, resource_item):
38+
def update_tags(self, baseurl, resource_item):
3939
if resource_item.tags != resource_item._initial_tags:
4040
add_set = resource_item.tags - resource_item._initial_tags
4141
remove_set = resource_item._initial_tags - resource_item.tags

‎tableauserverclient/server/endpoint/views_endpoint.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from .endpoint import Endpoint, api
22
from .exceptions import MissingRequiredFieldError
3-
from .resource_tagger import ResourceTagger
3+
from .resource_tagger import _ResourceTagger
44
from .. import RequestFactory, ViewItem, Paginati 1E0A onItem
55
from ...models.tag_item import TagItem
66
import logging
@@ -12,7 +12,7 @@
1212
class Views(Endpoint):
1313
def __init__(self, parent_srv):
1414
super(Views, self).__init__(parent_srv)
15-
self._resource_tagger = ResourceTagger(parent_srv)
15+
self._resource_tagger = _ResourceTagger(parent_srv)
1616

1717
# Used because populate_preview_image functionaliy requires workbook endpoint
1818
@property
@@ -57,7 +57,7 @@ def update(self, view_item):
5757
error = "View item missing ID. View must be retrieved from server first."
5858
raise MissingRequiredFieldError(error)
5959

60-
self._resource_tagger._update_tags(self.baseurl, view_item)
60+
self._resource_tagger.update_tags(self.baseurl, view_item)
6161

6262
# Returning view item to stay consistent with datasource/view update functions
6363
return view_item

‎tableauserverclient/server/endpoint/workbooks_endpoint.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from .endpoint import Endpoint, api, parameter_added_in
22
from .exceptions import MissingRequiredFieldError
33
from .fileuploads_endpoint import Fileuploads
4-
from .resource_tagger import ResourceTagger
4+
from .resource_tagger import _ResourceTagger
55
from .. import RequestFactory, WorkbookItem, ConnectionItem, ViewItem, PaginationItem
66
from ...models.tag_item import TagItem
77
from ...filesys_helpers import to_filename
@@ -23,7 +23,7 @@
2323
class Workbooks(Endpoint):
2424
def __init__(self, parent_srv):
2525
super(Workbooks, self).__init__(parent_srv)
26-
self._resource_tagger = ResourceTagger(parent_srv)
26+
self._resource_tagger = _ResourceTagger(parent_srv)
2727

2828
@property
2929
def baseurl(self):
@@ -67,7 +67,7 @@ def update(self, workbook_item):
6767
error = "Workbook item missing ID. Workbook must be retrieved from server first."
6868
raise MissingRequiredFieldError(error)
6969

70-
self._resource_tagger._update_tags(self.baseurl, workbook_item)
70+
self._resource_tagger.update_tags(self.baseurl, workbook_item)
7171

7272
# Update the workbook itself
7373
url = "{0}/{1}".format(self.baseurl, workbook_item.id)

0 commit comments

Comments
 (0)
0