Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Cleanup duplications #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
graysonarts merged 7 commits into from
Oct 28, 2016
Merged

Cleanup duplications #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6e75e4f
Cleaning up the base endpoint object to reduce duplication
Oct 28, 2016
ce600ed
Deduping the ctors for Endpoints
Oct 28, 2016
aa2e122
Adding comment to clarify the condition on server_response.encoding
Oct 28, 2016
9ab57ea
fixing pep8 problems
Oct 28, 2016
602811e
Auth Endpoint had two __init__, getting rid of both of them because t…
Oct 28, 2016
a6c3bce
make_headers -> make_common_headers
Oct 28, 2016
0dc9090
token -> auth_token
Oct 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions 4 tableauserverclient/server/endpoint/auth_endpoint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ def __enter__(self):
def __exit__(self, exc_type, exc_val, exc_tb):
self._callback()

def __init__(self, parent_srv):
super(Endpoint, self).__init__()
self.parent_srv = parent_srv

@property
def baseurl(self):
return "{0}/auth".format(self.parent_srv.baseurl)
Expand Down
4 changes: 0 additions & 4 deletions 4 tableauserverclient/server/endpoint/datasources_endpoint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@


class Datasources(Endpoint):
def __init__(self, parent_srv):
super(Endpoint, self).__init__()
self.parent_srv = parent_srv

@property
def baseurl(self):
return "{0}/sites/{1}/datasources".format(self.parent_srv.baseurl, self.parent_srv.site_id)
Expand Down
83 changes: 40 additions & 43 deletions 83 tableauserverclient/server/endpoint/endpoint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,64 +8,61 @@


class Endpoint(object):
def __init__(self):
self.parent_srv = None
def __init__(self, parent_srv):
self.parent_srv = parent_srv

@staticmethod
def _check_status(server_response):
if server_response.status_code not in Success_codes:
raise ServerResponseError.from_response(server_response.content)
def _make_common_headers(auth_token, content_type):
retval = {}
if auth_token is not None:
retval['x-tableau-auth'] = auth_token
if content_type is not None:
retval['content-type'] = content_type

def get_unauthenticated_request(self, url, request_object=None):
def _make_request(self, method, url, content=None, request_object=None, auth_token=None, content_type=None):
if request_object is not None:
url = request_object.apply_query_params(url)
server_response = self.parent_srv.session.get(url, **self.parent_srv.http_options)
parameters = {}
parameters.update(self.parent_srv.http_options)
parameters['headers'] = Endpoint._make_common_headers(auth_token, content_type)

if content is not None:
parameters['data'] = content

server_response = method(url, **parameters)
self._check_status(server_response)

# This check is to determine if the response is a text response (xml or otherwise)
# so that we do not attempt to log bytes and other binary data.
Copy link
Collaborator

@t8y8 t8y8 Oct 28, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!!!

if server_response.encoding:
logger.debug(u'Server response from {0}:\n\t{1}'.format(
url, server_response.content.decode(server_response.encoding)))
return server_response

@staticmethod
def _check_status(server_response):
if server_response.status_code not in Success_codes:
raise ServerResponseError.from_response(server_response.content)

def get_unauthenticated_request(self, url, request_object=None):
return self._make_request(self.parent_srv.session.get, url, request_object=request_object)

def get_request(self, url, request_object=None):
if request_object is not None:
url = request_object.apply_query_params(url)
auth_token = self.parent_srv.auth_token
server_response = self.parent_srv.session.get(url,
headers={'x-tableau-auth': auth_token},
**self.parent_srv.http_options)
self._check_status(server_response)
if server_response.encoding:
logger.debug(u'Server response from {0}: \n\t{1}'.format(
url, server_response.content.decode(server_response.encoding)))
return server_response
return self._make_request(self.parent_srv.session.get, url, auth_token=self.parent_srv.auth_token,
request_object=request_object)

def delete_request(self, url):
auth_token = self.parent_srv.auth_token
server_response = self.parent_srv.session.delete(url,
headers={'x-tableau-auth': auth_token},
**self.parent_srv.http_options)
self._check_status(server_response)
# We don't return anything for a delete
self._make_request(self.parent_srv.session.delete, url, auth_token=self.parent_srv.auth_token)

def put_request(self, url, xml_request, content_type='text/xml'):
auth_token = self.parent_srv.auth_token
server_response = self.parent_srv.session.put(url, data=xml_request,
headers={'x-tableau-auth': auth_token,
'content-type': content_type},
**self.parent_srv.http_options)
self._check_status(server_response)
if server_response.encoding:
logger.debug(u'Server response from {0}: \n\t{1}'.format(
url, server_response.content.decode(server_response.encoding)))
return server_response
return self._make_request(self.parent_srv.session.put, url,
content=xml_request,
auth_token=self.parent_srv.auth_token,
content_type=content_type)

def post_request(self, url, xml_request, content_type='text/xml'):
auth_token = self.parent_srv.auth_token
server_response = self.parent_srv.session.post(url, data=xml_request,
headers={'x-tableau-auth': auth_token,
'content-type': content_type},
**self.parent_srv.http_options)
self._check_status(server_response)
if server_response.encoding:
logger.debug(u'Server response from {0}: \n\t{1}'.format(
url, server_response.content.decode(server_response.encoding)))
return server_response
return self._make_request(self.parent_srv.session.post, url,
content=xml_request,
auth_token=self.parent_srv.auth_token,
content_type=content_type)
3 changes: 1 addition & 2 deletions 3 tableauserverclient/server/endpoint/fileuploads_endpoint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@

class Fileuploads(Endpoint):
def __init__(self, parent_srv):
super(Endpoint, self).__init__()
self.parent_srv = parent_srv
super(Fileuploads, self).__init__(parent_srv)
self.upload_id = ''

@property
Expand Down
4 changes: 0 additions & 4 deletions 4 tableauserverclient/server/endpoint/groups_endpoint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@


class Groups(Endpoint):
def __init__(self, parent_srv):
super(Endpoint, self).__init__()
self.parent_srv = parent_srv

@property
def baseurl(self):
return "{0}/sites/{1}/groups".format(self.parent_srv.baseurl, self.parent_srv.site_id)
Expand Down
4 changes: 0 additions & 4 deletions 4 tableauserverclient/server/endpoint/projects_endpoint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@


class Projects(Endpoint):
def __init__(self, parent_srv):
super(Endpoint, self).__init__()
self.parent_srv = parent_srv

@property
def baseurl(self):
return "{0}/sites/{1}/projects".format(self.parent_srv.baseurl, self.parent_srv.site_id)
Expand Down
4 changes: 0 additions & 4 deletions 4 tableauserverclient/server/endpoint/schedules_endpoint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@


class Schedules(Endpoint):
def __init__(self, parent_srv):
super(Endpoint, self).__init__()
self.parent_srv = parent_srv

@property
def baseurl(self):
return "{0}/schedules".format(self.parent_srv.baseurl)
Expand Down
4 changes: 0 additions & 4 deletions 4 tableauserverclient/server/endpoint/server_info_endpoint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@


class ServerInfo(Endpoint):
def __init__(self, parent_srv):
super(Endpoint, self).__init__()
self.parent_srv = parent_srv

@property
def baseurl(self):
return "{0}/serverInfo".format(self.parent_srv.baseurl)
Expand Down
4 changes: 0 additions & 4 deletions 4 tableauserverclient/server/endpoint/sites_endpoint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@


class Sites(Endpoint):
def __init__(self, parent_srv):
super(Endpoint, self).__init__()
self.parent_srv = parent_srv

@property
def baseurl(self):
return "{0}/sites".format(self.parent_srv.baseurl)
Expand Down
4 changes: 0 additions & 4 deletions 4 tableauserverclient/server/endpoint/users_endpoint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@


class Users(Endpoint):
def __init__(self, parent_srv):
super(Endpoint, self).__init__()
self.parent_srv = parent_srv

@property
def baseurl(self):
return "{0}/sites/{1}/users".format(self.parent_srv.baseurl, self.parent_srv.site_id)
Expand Down
4 changes: 0 additions & 4 deletions 4 tableauserverclient/server/endpoint/views_endpoint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@


class Views(Endpoint):
def __init__(self, parent_srv):
super(Endpoint, self).__init__()
self.parent_srv = parent_srv

@property
def baseurl(self):
return "{0}/sites/{1}".format(self.parent_srv.baseurl, self.parent_srv.site_id)
Expand Down
4 changes: 0 additions & 4 deletions 4 tableauserverclient/server/endpoint/workbooks_endpoint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@


class Workbooks(Endpoint):
def __init__(self, parent_srv):
super(Endpoint, self).__init__()
self.parent_srv = parent_srv

@property
def baseurl(self):
return "{0}/sites/{1}/workbooks".format(self.parent_srv.baseurl, self.parent_srv.site_id)
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.