8000 ran through pycodestyle · zeninpalm/server-client-python@12ca9fe · GitHub
[go: up one dir, main page]

Skip to content

Commit 12ca9fe

Browse files
committed
ran through pycodestyle
1 parent fdc403b commit 12ca9fe

File tree

7 files changed

+24
-28
lines changed

7 files changed

+24
-28
lines changed

tableauserverclient/server/endpoint/datasources_endpoint.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ def refresh(self, datasource_item):
151151
server_response = self.post_request(url, empty_req)
152152
new_job = JobItem.from_response(server_response.content, self.parent_srv.namespace)[0]
153153
return new_job
154-
154+
155155
@api(version='3.5')
156156
def create_extract(self, datasource_item, encrypt=False):
157157
id_ = getattr(datasource_item, 'id', datasource_item)
@@ -167,7 +167,6 @@ def delete_extract(self, datasource_item):
167167
url = "{0}/{1}/deleteExtract".format(self.baseurl, id_)
168168
empty_req = RequestFactory.Empty.empty_req()
169169
self.post_request(url, empty_req)
170-
171170

172171
# Publish datasource
173172
@api(version="2.0")

tableauserverclient/server/endpoint/sites_endpoint.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,7 @@ def encrypt_extracts(self, site_id):
111111
raise ValueError(error)
112112
url = "{0}/{1}/encrypt-extracts".format(self.baseurl, site_id)
113113
empty_req = RequestFactory.Empty.empty_req()
114-
self.post_request(url,empty_req)
115-
114+
self.post_request(url, empty_req)
116115

117116
@api(version="3.5")
118117
def decrypt_extracts(self, site_id):
@@ -121,15 +120,14 @@ def decrypt_extracts(self, site_id):
121120
raise ValueError(error)
122121
url = "{0}/{1}/decrypt-extracts".format(self.baseurl, site_id)
123122
empty_req = RequestFactory.Empty.empty_req()
124-
self.post_request(url,empty_req)
125-
123+
self.post_request(url, empty_req)
126124

127125
@api(version="3.5")
128126
def re_encrypt_extracts(self, site_id):
129127
if not site_id:
130128
error = "Site ID undefined."
131129
raise ValueError(error)
132130
url = "{0}/{1}/reencrypt-extracts".format(self.baseurl, site_id)
133-
131+
134132
empty_req = RequestFactory.Empty.empty_req()
135-
self.post_request(url,empty_req)
133+
self.post_request(url, empty_req)

tableauserverclient/server/endpoint/workbooks_endpoint.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,25 +61,24 @@ def refresh(self, workbook_id):
6161
new_job = JobItem.from_response(server_response.content, self.parent_srv.namespace)[0]
6262
return new_job
6363

64-
64+
# create one or more extracts on 1 workbook, optionally encrypted
6565
@api(version='3.5')
6666
def create_extract(self, workbook_item, encrypt=False, includeAll=True, datasources=None):
6767
id_ = getattr(workbook_item, 'id', workbook_item)
6868
url = "{0}/{1}/createExtract?encrypt={2}".format(self.baseurl, id_, encrypt)
6969

7070
datasource_req = RequestFactory.Workbook.embedded_extract_req(includeAll, datasources)
71-
7271
server_response = self.post_request(url, datasource_req)
7372
new_job = JobItem.from_response(server_response.content, self.parent_srv.namespace)[0]
7473
return new_job
7574

75+
# delete all the extracts on 1 workbook
7676
@api(version='3.5')
7777
def delete_extract(self, workbook_item):
7878
id_ = getattr(workbook_item, 'id', workbook_item)
7979
url = "{0}/{1}/deleteExtract".format(self.baseurl, id_)
8080
empty_req = RequestFactory.Empty.empty_req()
8181
server_response = self.post_request(url, empty_req)
82-
8382

8483
# Delete 1 workbook by id
8584
@api(version="2.0")

tableauserverclient/server/request_factory.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -568,12 +568,11 @@ def publish_req_chunked(
568568
parts = {'request_payload': ('', xml_request, 'text/xml')}
569569
return _add_multipart(parts)
570570

571-
572571
@_tsrequest_wrapped
573572
def embedded_extract_req(self, xml_request, include_all=True, datasources=None):
574573
list_element = ET.SubElement(xml_request, 'datasources')
575574
if include_all:
576-
list_element.attrib['includeAll']="true"
575+
list_element.attrib['includeAll'] = "true"
577576
else:
578577
for datasource_item in datasources:
579578
datasource_element = list_element.SubElement(xml_request, 'datasource')

test/test_datasource.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -392,19 +392,19 @@ def test_delete_extracts(self):
392392
def test_create_extracts(self):
393393
self.server.version = "3.10"
394394
self.baseurl = self.server.datasources.baseurl
395-
395+
396396
response_xml = read_xml_asset(PUBLISH_XML_ASYNC)
397397
with requests_mock.mock() as m:
398-
m.post(self.baseurl + '/3cc6cd06-89ce-4fdc-b935-5294135d6d42/createExtract', status_code=200, text=response_xml)
398+
m.post(self.baseurl + '/3cc6cd06-89ce-4fdc-b935-5294135d6d42/createExtract',
399+
status_code=200, text=response_xml)
399400
self.server.datasources.create_extract('3cc6cd06-89ce-4fdc-b935-5294135d6d42')
400401

401402
def test_create_extracts_encrypted(self):
402403
self.server.version = "3.10"
403404
self.baseurl = self.server.datasources.baseurl
404-
405+
405406
response_xml = read_xml_asset(PUBLISH_XML_ASYNC)
406407
with requests_mock.mock() as m:
407-
m.post(self.baseurl + '/3cc6cd06-89ce-4fdc-b935-5294135d6d42/createExtract', status_code=200, text=response_xml)
408+
m.post(self.baseurl + '/3cc6cd06-89ce-4fdc-b935-5294135d6d42/createExtract',
409+
status_code=200, text=response_xml)
408410
self.server.datasources.create_extract('3cc6cd06-89ce-4fdc-b935-5294135d6d42', True)
409-
410-

test/test_site.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@ def test_recrypt(self):
151151
with requests_mock.mock() as m:
152152
m.post(self.baseurl + '/0626857c-1def-4503-a7d8-7907c3ff9d9f/reencrypt-extracts', status_code=200)
153153
self.server.sites.re_encrypt_extracts('0626857c-1def-4503-a7d8-7907c3ff9d9f')
154-
154+
155155
def test_decrypt(self):
156156
with requests_mock.mock() as m:
157157
m.post(self.baseurl + '/0626857c-1def-4503-a7d8-7907c3ff9d9f/decrypt-extracts', status_code=200)
158-
self.server.sites.decrypt_extracts('0626857c-1def-4503-a7d8-7907c3ff9d9f')
158+
self.server.sites.decrypt_extracts('0626857c-1def-4503-a7d8-7907c3ff9d9f')

test/test_workbook.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -580,23 +580,24 @@ def test_delete_extracts_all(self):
580580
def test_create_extracts_all(self):
581581
self.server.version = "3.10"
582582
self.baseurl = self.server.workbooks.baseurl
583-
583+
584584
with open(PUBLISH_ASYNC_XML, 'rb') as f:
585585
response_xml = f.read().decode('utf-8')
586586
with requests_mock.mock() as m:
587-
m.post(self.baseurl + '/3cc6cd06-89ce-4fdc-b935-5294135d6d42/createExtract', status_code=200, text=response_xml)
587+
m.post(self.baseurl + '/3cc6cd06-89ce-4fdc-b935-5294135d6d42/createExtract',
588+
status_code=200, text=response_xml)
588589
self.server.workbooks.create_extract('3cc6cd06-89ce-4fdc-b935-5294135d6d42')
589590

590-
591591
def test_create_extracts_one(self):
592592
self.server.version = "3.10"
593593
self.baseurl = self.server.workbooks.baseurl
594-
594+
595595
datasource = TSC.DatasourceItem('test')
596596
datasource._id = '1f951daf-4061-451a-9df1-69a8062664f2'
597< 6E72 /td>-
597+
598598
with open(PUBLISH_ASYNC_XML, 'rb') as f:
599599
response_xml = f.read().decode('utf-8')
600600
with requests_mock.mock() as m:
601-
m.post(self.baseurl + '/3cc6cd06-89ce-4fdc-b935-5294135d6d42/createExtract', status_code=200, text=response_xml)
602-
self.server.workbooks.create_extract('3cc6cd06-89ce-4fdc-b935-5294135d6d42', False, datasource)
601+
m.post(self.baseurl + '/3cc6cd06-89ce-4fdc-b935-5294135d6d42/createExtract',
602+
status_code=200, text=response_xml)
603+
self.server.workbooks.create_extract('3cc6cd06-89ce-4fdc-b935-5294135d6d42', False, datasource)

0 commit comments

Comments
 (0)
0