8000 Minor cleanups in __init__ and ScheduleItem serializer, and a flake8 … · d45/server-client-python@6da2cbe · GitHub
[go: up one dir, main page]
Skip to content

Commit 6da2cbe

Browse files
t8y8t8y8
authored
Minor cleanups in __init__ and ScheduleItem serializer, and a flake8 cleanup (tableau#57)
1 parent 5dbdbee commit 6da2cbe

File tree

9 files changed

+16
-63
lines changed

9 files changed

+16
-63
lines changed

‎tableauserverclient/models/datasource_item.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,12 @@ def __init__(self, project_id, name=None):
1111
self._content_url = None
1212
self._created_at = None
1313
self._id = None
14-
self._project_id = None
1514
self._project_name = None
1615
self._tags = set()
1716
self._datasource_type = None
1817
self._updated_at = None
1918
self.name = name
2019
self.owner_id = None
21-
22-
# Invoke setter
2320
self.project_id = project_id
2421

2522
@property

‎tableauserverclient/models/group_item.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@ class GroupItem(object):
88
def __init__(self, name):
99
self._domain_name = None
1010
self._id = None
11-
self._name = None
1211
self._users = None
13-
14-
# Invoke setter
1512
self.name = name
1613

1714
@property

‎tableauserverclient/models/project_item.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,9 @@ class ContentPermissions:
1111
def __init__(self, name, description=None, content_permissions=None):
1212
self._content_permissions = None
1313
self._id = None
14-
self._name = None
1514
self.description = description
16-
17-
# Invoke setter
1815
self.name = name
19-
20-
if content_permissions:
21-
# In order to invoke the setter method to validate content_permissions,
22-
# _content_permissions must be initialized first.
23-
self.content_permissions = content_permissions
16+
self.content_permissions = content_permissions
2417

2518
@property
2619
def content_permissions(self):

‎tableauserverclient/models/schedule_item.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,11 @@ class State:
2222
def __init__(self, name, priority, schedule_type, execution_order, interval_item):
2323
self._created_at = None
2424
self._end_schedule_at = None
25-
self._execution_order = None
2625
self._id = None
27-
self._name = None
2826
self._next_run_at = None
29-
self._priority = None
30-
self._schedule_type = None
3127
self._state = None
3228
self._updated_at = None
3329
self.interval_item = interval_item
34-
35-
# Invoke setter
3630
self.execution_order = execution_order
3731
self.name = name
3832
self.priority = priority

‎tableauserverclient/models/site_item.py

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,20 @@ class State:
1515
def __init__(self, name, content_url, admin_mode=None, user_quota=None, storage_quota=None,
1616
disable_subscriptions=False, subscribe_others_enabled=True, revision_history_enabled=False):
1717
self._admin_mode = None
18-
self._content_url = None
19-
self._disable_subscriptions = None
2018
self._id = None
21-
self._name = None
2219
self._num_users = None
23-
self._revision_history_enabled = None
2420
self._state = None
2521
self._status_reason = None
2622
self._storage = None
27-
self._subscribe_others_enabled = None
2823
self.revision_limit = None
2924
self.user_quota = user_quota
3025
self.storage_quota = storage_quota
31-
32-
# Invoke setter
3326
self.content_url = content_url
3427
self.disable_subscriptions = disable_subscriptions
3528
self.name = name
3629
self.revision_history_enabled = revision_history_enabled
3730
self.subscribe_others_enabled = subscribe_others_enabled
38-
39-
if admin_mode:
40-
# In order to invoke the setter method to validate admin_mode,
41-
# _admin_mode must be initialized first.
42-
self.admin_mode = admin_mode
31+
self.admin_mode = admin_mode
4332

4433
@property
4534
def admin_mode(self):

‎tableauserverclient/models/user_item.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,13 @@ def __init__(self, name, site_role, auth_setting=None):
2525
self._external_auth_user_id = None
2626
self._id = None
2727
self._last_login = None
28-
self._name = None
29-
self._site_role = None
3028
self._workbooks = None
3129
self.email = None
3230
self.fullname = None
3331
self.password = None
34-
35-
# Invoke setter
3632
self.name = name
3733
self.site_role = site_role
38-
39-
if auth_setting:
40-
# In order to invoke the setter method for auth_setting,
41-
# _auth_setting must be initialized first
42-
self.auth_setting = auth_setting
34+
self.auth_setting = auth_setting
4335

4436
@property
4537
def auth_setting(self):

‎tableauserverclient/models/workbook_item.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,13 @@ def __init__(self, project_id, name=None, show_tabs=False):
1515
self._id = None
1616
self._initial_tags = set()
1717
self._preview_image = None
18-
self._project_id = None
1918
self._project_name = None
20-
self._show_tabs = None
2119
self._size = None
2220
self._updated_at = None
2321
self._views = None
2422
self.name = name
2523
self.owner_id = None
2624
self.tags = set()
27-
28-
# Invoke setter
2925
self.project_id = project_id
3026
self.show_tabs = show_tabs
3127

‎tableauserverclient/server/endpoint/exceptions.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@ def __str__(self):
1616
def from_response(cls, resp):
1717
# Check elements exist before .text
1818
parsed_response = ET.fromstring(resp)
19-
error_response = cls(
20-
parsed_response.find('t:error', namespaces=NAMESPACE).get('code', ''),
21-
parsed_response.find('.//t:summary', namespaces=NAMESPACE).text,
22-
parsed_response.find('.//t:detail', namespaces=NAMESPACE).text
23-
)
19+
error_response = cls(parsed_response.find('t:error', namespaces=NAMESPACE).get('code', ''),
20+
parsed_response.find('.//t:summary', namespaces=NAMESPACE).text,
21+
parsed_response.find('.//t:detail', namespaces=NAMESPACE).text)
2422
return error_response
2523

2624

‎tableauserverclient/server/request_factory.py

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -141,16 +141,14 @@ def create_req(self, schedule_item):
141141
schedule_element.attrib['frequency'] = interval_item._frequency
142142
frequency_element = ET.SubElement(schedule_element, 'frequencyDetails')
143143
frequency_element.attrib['start'] = str(interval_item.start_time)
144-
if hasattr(interval_item, 'end_time'):
145-
if interval_item.end_time:
146-
frequency_element.attrib['end'] = str(interval_item.end_time)
147-
if hasattr(interval_item, 'interval'):
148-
if interval_item.interval:
149-
intervals_element = ET.SubElement(frequency_element, 'intervals')
150-
for interval in interval_item._interval_type_pairs():
151-
expression, value = interval
152-
single_interval_element = ET.SubElement(intervals_element, 'interval')
153-
single_interval_element.attrib[expression] = value
144+
if hasattr(interval_item, 'end_time') and interval_item.end_time:
145+
frequency_element.attrib['end'] = str(interval_item.end_time)
146+
if hasattr(interval_item, 'interval') and interval_item.interval:
147+
intervals_element = ET.SubElement(frequency_element, 'intervals')
148+
for interval in interval_item._interval_type_pairs():
149+
expression, value = interval
150+
single_interval_element = ET.SubElement(intervals_element, 'interval')
151+
single_interval_element.attrib[expression] = value
154152
return ET.tostring(xml_request)
155153

156154
def update_req(self, schedule_item):
@@ -169,9 +167,8 @@ def update_req(self, schedule_item):
169167
schedule_element.attrib['frequency'] = interval_item._frequency
170168
frequency_element = ET.SubElement(schedule_element, 'frequencyDetails')
171169
frequency_element.attrib['start'] = str(interval_item.start_time)
172-
if hasattr(interval_item, 'end_time'):
173-
if interval_item.end_time:
174-
frequency_element.attrib['end'] = str(interval_item.end_time)
170+
if hasattr(interval_item, 'end_time') and interval_item.end_time:
171+
frequency_element.attrib['end'] = str(interval_item.end_time)
175172
intervals_element = ET.SubElement(frequency_element, 'intervals')
176173
if hasattr(interval_item, 'interval'):
177174
for interval in interval_item._interval_type_pairs():

0 commit comments

Comments
 (0)
0