Skip to content

Minor tweaks. #2

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
kgpayne merged 4 commits into from
Feb 7, 2021
Merged

Minor tweaks. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9cf89e2
Added new relation entity and to_dict() methods.
Feb 5, 2021
851de98
More tidying.
Feb 7, 2021
4de2e8f
Minor tweaks.
Feb 7, 2021
13829cc
Merge branch 'master' into kp/add_additional_object_types
Feb 7, 2021
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
8 changes: 4 additions & 4 deletions tableaudocumentapi/connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ def __init__(self, connxml, version=None):
self._relation_parser = RelationParser(
connxml, version=version
)
self._relations = self._relation_parser.get_relations()
self._relation = self._relation_parser.get_relations()

def _extract_named_connections(self):
named_connections = [
Expand All @@ -276,12 +276,12 @@ def named_connections(self):
return self._named_connections

@property
def relations(self):
return self._relations
def relation(self):
return self._relation

def to_dict(self):
base = super().base_dict()
to_dict_list_attrs = ['relations']
to_dict_list_attrs = ['relation']
to_dict_of_dict_attrs = ['named_connections']
base.update(
self._to_dict(
Expand Down
4 changes: 2 additions & 2 deletions tableaudocumentapi/relation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def __init__(self, relxml):
self._table = relxml.get('table')
self._text = self._extract_text()
self._clause = self._extract_clause()
self._relations = self._extract_relations()
self._relation = self._extract_relations()

def _extract_clause(self):
clxml = self._relationXML.find('./clause')
Expand Down Expand Up @@ -117,7 +117,7 @@ def clause(self):

@property
def relation(self):
return self._relations
return self._relation

def _base_dict(self):
base_attrs = ['type', 'name', 'connection', 'table', 'text']
Expand Down