Skip to content

Commit

Permalink
Merge branch 'master' of github.com:sarumont/py-trello
Browse files Browse the repository at this point in the history
  • Loading branch information
@jean
jean committed Jul 24, 2016
2 parents 571fb2c + 3737f86 commit 696e7d3
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 43 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Expand Up @@ -8,3 +8,4 @@ dist
.project
.pydevproject
.idea/
.tox/
46 changes: 23 additions & 23 deletions trello/board.py
View file
Expand Up @@ -97,60 +97,60 @@ def open(self):
self.closed = False

def get_list(self, list_id):
'''Get list
"""Get list
:rtype: List
'''
"""
obj = self.client.fetch_json('/lists/' + list_id)
return List.from_json(board=self, json_obj=obj)

def all_lists(self):
"""Returns all lists on this board
:rtype: List
:rtype: list of List
"""
return self.get_lists('all')

def open_lists(self):
"""Returns all open lists on this board
:rtype: List
:rtype: list of List
"""
return self.get_lists('open')

def closed_lists(self):
"""Returns all closed lists on this board
:rtype: List
:rtype: list of List
"""
return self.get_lists('closed')

def get_lists(self, list_filter):
'''Get lists from filter
"""Get lists from filter
:rtype: List
'''
:rtype: list of List
"""
# error checking
json_obj = self.client.fetch_json(
'/boards/' + self.id + '/lists',
query_params={'cards': 'none', 'filter': list_filter})
return [List.from_json(board=self, json_obj=obj) for obj in json_obj]

def get_labels(self, fields='all', limit=50):
'''Get label
"""Get label
:rtype: Label
'''
:rtype: list of Label
"""
json_obj = self.client.fetch_json(
'/boards/' + self.id + '/labels',
query_params={'fields': fields, 'limit': limit})
return Label.from_json_list(self, json_obj)

def get_checklists(self, cards='all'):
'''Get checklists
"""Get checklists
:rtype: Checklist
'''
:rtype: list of Checklist
"""
checklists = []
json_obj = self.client.fetch_json(
'/boards/' + self.id + '/checklists',
Expand Down Expand Up @@ -192,7 +192,7 @@ def add_label(self, name, color):
def all_cards(self):
"""Returns all cards on this board
:rtype: Card
:rtype: list of Card
"""
filters = {
'filter': 'all',
Expand All @@ -203,7 +203,7 @@ def all_cards(self):
def open_cards(self):
"""Returns all open cards on this board
:rtype: Card
:rtype: list of Card
"""
filters = {
'filter': 'open',
Expand All @@ -214,7 +214,7 @@ def open_cards(self):
def closed_cards(self):
"""Returns all closed cards on this board
:rtype: Card
:rtype: list of Card
"""
filters = {
'filter': 'closed',
Expand All @@ -230,7 +230,7 @@ def get_cards(self, filters=None, card_filter=""):
More info on card queries:
https://trello.com/docs/api/board/index.html#get-1-boards-board-id-cards
:rtype: Card
:rtype: list of Card
"""
json_obj = self.client.fetch_json(
'/boards/' + self.id + '/cards/' + card_filter,
Expand All @@ -242,7 +242,7 @@ def get_cards(self, filters=None, card_filter=""):
def all_members(self):
"""Returns all members on this board
:rtype: Member
:rtype: list of Member
"""
filters = {
'filter': 'all',
Expand All @@ -253,7 +253,7 @@ def all_members(self):
def normal_members(self):
"""Returns all normal members on this board
:rtype: Member
:rtype: list of Member
"""
filters = {
'filter': 'normal',
Expand All @@ -264,7 +264,7 @@ def normal_members(self):
def admin_members(self):
"""Returns all admin members on this board
:rtype: Member
:rtype: list of Member
"""
filters = {
'filter': 'admins',
Expand All @@ -275,7 +275,7 @@ def admin_members(self):
def owner_members(self):
"""Returns all owner members on this board
:rtype: Member
:rtype: list of Member
"""
filters = {
'filter': 'owners',
Expand All @@ -286,7 +286,7 @@ def owner_members(self):
def get_members(self, filters=None):
"""Get members with filter
:rtype: Member
:rtype: list of Member
"""
json_obj = self.client.fetch_json(
'/boards/' + self.id + '/members',
Expand Down
12 changes: 6 additions & 6 deletions trello/organization.py
View file
Expand Up @@ -46,21 +46,21 @@ def all_boards(self):
return self.get_boards('all')

def get_boards(self, list_filter):
'''Get boards using filter
"""Get boards using filter
:rtype: Board
'''
:rtype: list of Board
"""
# error checking
json_obj = self.client.fetch_json(
'/organizations/' + self.id + '/boards',
query_params={'lists': 'none', 'filter': list_filter})
return [Board.from_json(organization=self, json_obj=obj) for obj in json_obj]

def get_board(self, field_name):
'''Get board
"""Get board
:rtype: Board
'''
:rtype: list of Board
"""
# error checking
json_obj = self.client.fetch_json(
'/organizations/' + self.id + '/boards',
Expand Down
28 changes: 14 additions & 14 deletions trello/trelloclient.py
View file
Expand Up @@ -72,7 +72,7 @@ def list_boards(self, board_filter="all"):
Returns all boards for your Trello user
:return: a list of Python objects representing the Trello boards.
:rtype: Board
:rtype: list of Board
Each board has the following noteworthy attributes:
- id: the board's identifier
Expand All @@ -90,7 +90,7 @@ def list_organizations(self):
Returns all organizations for your Trello user
:return: a list of Python objects representing the Trello organizations.
:rtype: Organization
:rtype: list of Organization
Each organization has the following noteworthy attributes:
- id: the organization's identifier
Expand All @@ -104,28 +104,28 @@ def list_organizations(self):
return [Organization.from_json(self, obj) for obj in json_obj]

def get_organization(self, organization_id):
'''Get organization
"""Get organization
:rtype: Organization
'''
"""
obj = self.fetch_json('/organizations/' + organization_id)

return Organization.from_json(self, obj)

def get_board(self, board_id):
'''Get board
"""Get board
:rtype: Board
'''
"""
obj = self.fetch_json('/boards/' + board_id)
return Board.from_json(self, json_obj=obj)

def add_board(self, board_name, source_board=None, organization_id=None):
'''Create board
"""Create board
:param board_name: Name of the board to create
:param source_board: Optional Board to copy
:rtype: Board
'''
"""
post_args={'name': board_name}
if source_board is not None:
post_args['idBoardSource'] = source_board.id
Expand All @@ -137,29 +137,29 @@ def add_board(self, board_name, source_board=None, organization_id=None):
return Board.from_json(self, json_obj=obj)

def get_member(self, member_id):
'''Get member
"""Get member
:rtype: Member
'''
"""
return Member(self, member_id).fetch()

def get_card(self, card_id):
'''Get card
"""Get card
:rtype: Card
'''
"""
card_json = self.fetch_json('/cards/' + card_id)
list_json = self.fetch_json('/lists/' + card_json['idList'])
board = self.get_board(card_json['idBoard'])
return Card.from_json(List.from_json(board, list_json), card_json)

def get_label(self, label_id, board_id):
'''Get Label
"""Get Label
Requires the parent board id the label is on
:rtype: Label
'''
"""
board = self.get_board(board_id)
label_json = self.fetch_json('/labels/' + label_id)
return Label.from_json(board, label_json)
Expand Down

0 comments on commit 696e7d3

Please sign in to comment.