# HG changeset patch # User Ben McCormack # Date 1343662814 14400 # Mon Jul 30 11:40:14 2012 -0400 # Node ID 87480b9b423f6826bd2570cb710cda57ea846a3e # Parent ca51a068a2a89fd108ac84c5025b8d58be6b1e87 Updated Trello API. diff --git a/trello/__init__.py b/trello/__init__.py --- a/trello/__init__.py +++ b/trello/__init__.py @@ -3,10 +3,12 @@ from .boards import Boards from .cards import Cards from .checklists import Checklists +from .devices import Devices from .lists import Lists from .members import Members from .notifications import Notifications from .organizations import Organizations +from .searchs import Searchs from .tokens import Tokens from .types import Types @@ -19,10 +21,12 @@ self.boards = Boards(apikey, token) self.cards = Cards(apikey, token) self.checklists = Checklists(apikey, token) + self.devices = Devices(apikey, token) self.lists = Lists(apikey, token) self.members = Members(apikey, token) self.notifications = Notifications(apikey, token) self.organizations = Organizations(apikey, token) + self.searchs = Searchs(apikey, token) self.tokens = Tokens(apikey, token) self.types = Types(apikey, token) @@ -33,10 +37,12 @@ self.boards._token = token self.cards._token = token self.checklists._token = token + self.devices._token = token self.lists._token = token self.members._token = token self.notifications._token = token self.organizations._token = token + self.searchs._token = token self.tokens._token = token self.types._token = token diff --git a/trello/actions.py b/trello/actions.py --- a/trello/actions.py +++ b/trello/actions.py @@ -8,73 +8,73 @@ self._apikey = apikey self._token = token - def get(self, action_id, fields=None, member=None, member_fields=None, memberCreator=None, memberCreator_fields=None): - resp = requests.get("https://trello.com/1/actions/%s" % (action_id), params=dict(key=self._apikey, token=self._token, fields=fields, member=member, member_fields=member_fields, memberCreator=memberCreator, memberCreator_fields=memberCreator_fields), data=None) + def get(self, idAction, fields=None, member=None, member_fields=None, memberCreator=None, memberCreator_fields=None): + resp = requests.get("https://trello.com/1/actions/%s" % (idAction), params=dict(key=self._apikey, token=self._token, fields=fields, member=member, member_fields=member_fields, memberCreator=memberCreator, memberCreator_fields=memberCreator_fields), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_field(self, field, action_id): - resp = requests.get("https://trello.com/1/actions/%s/%s" % (action_id, field), params=dict(key=self._apikey, token=self._token), data=None) + def get_field(self, field, idAction): + resp = requests.get("https://trello.com/1/actions/%s/%s" % (idAction, field), params=dict(key=self._apikey, token=self._token), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_board(self, action_id, fields=None): - resp = requests.get("https://trello.com/1/actions/%s/board" % (action_id), params=dict(key=self._apikey, token=self._token, fields=fields), data=None) + def get_board(self, idAction, fields=None): + resp = requests.get("https://trello.com/1/actions/%s/board" % (idAction), params=dict(key=self._apikey, token=self._token, fields=fields), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_board_field(self, field, action_id): - resp = requests.get("https://trello.com/1/actions/%s/board/%s" % (action_id, field), params=dict(key=self._apikey, token=self._token), data=None) + def get_board_field(self, field, idAction): + resp = requests.get("https://trello.com/1/actions/%s/board/%s" % (idAction, field), params=dict(key=self._apikey, token=self._token), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_card(self, action_id, fields=None): - resp = requests.get("https://trello.com/1/actions/%s/card" % (action_id), params=dict(key=self._apikey, token=self._token, fields=fields), data=None) + def get_card(self, idAction, fields=None): + resp = requests.get("https://trello.com/1/actions/%s/card" % (idAction), params=dict(key=self._apikey, token=self._token, fields=fields), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_card_field(self, field, action_id): - resp = requests.get("https://trello.com/1/actions/%s/card/%s" % (action_id, field), params=dict(key=self._apikey, token=self._token), data=None) + def get_card_field(self, field, idAction): + resp = requests.get("https://trello.com/1/actions/%s/card/%s" % (idAction, field), params=dict(key=self._apikey, token=self._token), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_list(self, action_id, fields=None): - resp = requests.get("https://trello.com/1/actions/%s/list" % (action_id), params=dict(key=self._apikey, token=self._token, fields=fields), data=None) + def get_list(self, idAction, fields=None): + resp = requests.get("https://trello.com/1/actions/%s/list" % (idAction), params=dict(key=self._apikey, token=self._token, fields=fields), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_list_field(self, field, action_id): - resp = requests.get("https://trello.com/1/actions/%s/list/%s" % (action_id, field), params=dict(key=self._apikey, token=self._token), data=None) + def get_list_field(self, field, idAction): + resp = requests.get("https://trello.com/1/actions/%s/list/%s" % (idAction, field), params=dict(key=self._apikey, token=self._token), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_member(self, action_id, fields=None): - resp = requests.get("https://trello.com/1/actions/%s/member" % (action_id), params=dict(key=self._apikey, token=self._token, fields=fields), data=None) + def get_member(self, idAction, fields=None): + resp = requests.get("https://trello.com/1/actions/%s/member" % (idAction), params=dict(key=self._apikey, token=self._token, fields=fields), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_member_field(self, field, action_id): - resp = requests.get("https://trello.com/1/actions/%s/member/%s" % (action_id, field), params=dict(key=self._apikey, token=self._token), data=None) + def get_member_field(self, field, idAction): + resp = requests.get("https://trello.com/1/actions/%s/member/%s" % (idAction, field), params=dict(key=self._apikey, token=self._token), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_memberCreator(self, action_id, fields=None): - resp = requests.get("https://trello.com/1/actions/%s/memberCreator" % (action_id), params=dict(key=self._apikey, token=self._token, fields=fields), data=None) + def get_memberCreator(self, idAction, fields=None): + resp = requests.get("https://trello.com/1/actions/%s/memberCreator" % (idAction), params=dict(key=self._apikey, token=self._token, fields=fields), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_memberCreator_field(self, field, action_id): - resp = requests.get("https://trello.com/1/actions/%s/memberCreator/%s" % (action_id, field), params=dict(key=self._apikey, token=self._token), data=None) + def get_memberCreator_field(self, field, idAction): + resp = requests.get("https://trello.com/1/actions/%s/memberCreator/%s" % (idAction, field), params=dict(key=self._apikey, token=self._token), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_organization(self, action_id, fields=None): - resp = requests.get("https://trello.com/1/actions/%s/organization" % (action_id), params=dict(key=self._apikey, token=self._token, fields=fields), data=None) + def get_organization(self, idAction, fields=None): + resp = requests.get("https://trello.com/1/actions/%s/organization" % (idAction), params=dict(key=self._apikey, token=self._token, fields=fields), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_organization_field(self, field, action_id): - resp = requests.get("https://trello.com/1/actions/%s/organization/%s" % (action_id, field), params=dict(key=self._apikey, token=self._token), data=None) + def get_organization_field(self, field, idAction): + resp = requests.get("https://trello.com/1/actions/%s/organization/%s" % (idAction, field), params=dict(key=self._apikey, token=self._token), data=None) resp.raise_for_status() return json.loads(resp.content) diff --git a/trello/boards.py b/trello/boards.py --- a/trello/boards.py +++ b/trello/boards.py @@ -8,8 +8,8 @@ self._apikey = apikey self._token = token - def get(self, board_id, actions=None, action_fields=None, action_limit=None, cards=None, card_fields=None, lists=None, list_fields=None, members=None, member_fields=None, membersInvited=None, membersInvited_fields=None, checklists=None, checklist_fields=None, organization=None, organization_fields=None, myPrefs=None, fields=None): - resp = requests.get("https://trello.com/1/boards/%s" % (board_id), params=dict(key=self._apikey, token=self._token, actions=actions, action_fields=action_fields, action_limit=action_limit, cards=cards, card_fields=card_fields, lists=lists, list_fields=list_fields, members=members, member_fields=member_fields, membersInvited=membersInvited, membersInvited_fields=membersInvited_fields, checklists=checklists, checklist_fields=checklist_fields, organization=organization, organization_fields=organization_fields, myPrefs=myPrefs, fields=fields), data=None) + def get(self, board_id, actions=None, actions_format=None, actions_since=None, actions_limit=None, action_fields=None, cards=None, card_fields=None, card_attachments=None, card_attachment_fields=None, lists=None, list_fields=None, members=None, member_fields=None, membersInvited=None, membersInvited_fields=None, checklists=None, checklist_fields=None, organization=None, organization_fields=None, myPrefs=None, fields=None): + resp = requests.get("https://trello.com/1/boards/%s" % (board_id), params=dict(key=self._apikey, token=self._token, actions=actions, actions_format=actions_format, actions_since=actions_since, actions_limit=actions_limit, action_fields=action_fields, cards=cards, card_fields=card_fields, card_attachments=card_attachments, card_attachment_fields=card_attachment_fields, lists=lists, list_fields=list_fields, members=members, member_fields=member_fields, membersInvited=membersInvited, membersInvited_fields=membersInvited_fields, checklists=checklists, checklist_fields=checklist_fields, organization=organization, organization_fields=organization_fields, myPrefs=myPrefs, fields=fields), data=None) resp.raise_for_status() return json.loads(resp.content) @@ -18,13 +18,13 @@ resp.raise_for_status() return json.loads(resp.content) - def get_action(self, board_id, filter=None, fields=None, limit=None, page=None, idModels=None): - resp = requests.get("https://trello.com/1/boards/%s/actions" % (board_id), params=dict(key=self._apikey, token=self._token, filter=filter, fields=fields, limit=limit, page=page, idModels=idModels), data=None) + def get_action(self, board_id, filter=None, fields=None, limit=None, format=None, since=None, page=None, idModels=None): + resp = requests.get("https://trello.com/1/boards/%s/actions" % (board_id), params=dict(key=self._apikey, token=self._token, filter=filter, fields=fields, limit=limit, format=format, since=since, page=page, idModels=idModels), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_card(self, board_id, actions=None, attachments=None, members=None, checkItemStates=None, checklists=None, filter=None, fields=None): - resp = requests.get("https://trello.com/1/boards/%s/cards" % (board_id), params=dict(key=self._apikey, token=self._token, actions=actions, attachments=attachments, members=members, checkItemStates=checkItemStates, checklists=checklists, filter=filter, fields=fields), data=None) + def get_card(self, board_id, actions=None, attachments=None, attachment_fields=None, members=None, member_fields=None, checkItemStates=None, checklists=None, filter=None, fields=None): + resp = requests.get("https://trello.com/1/boards/%s/cards" % (board_id), params=dict(key=self._apikey, token=self._token, actions=actions, attachments=attachments, attachment_fields=attachment_fields, members=members, member_fields=member_fields, checkItemStates=checkItemStates, checklists=checklists, filter=filter, fields=fields), data=None) resp.raise_for_status() return json.loads(resp.content) @@ -33,8 +33,8 @@ resp.raise_for_status() return json.loads(resp.content) - def get_card_idCard(self, idCard, board_id, actions=None, action_fields=None, action_limit=None, members=None, member_fields=None, checkItemStates=None, checkItemState_fields=None, labels=None, checklists=None, checklist_fields=None, fields=None): - resp = requests.get("https://trello.com/1/boards/%s/cards/%s" % (board_id, idCard), params=dict(key=self._apikey, token=self._token, actions=actions, action_fields=action_fields, action_limit=action_limit, members=members, member_fields=member_fields, checkItemStates=checkItemStates, checkItemState_fields=checkItemState_fields, labels=labels, checklists=checklists, checklist_fields=checklist_fields, fields=fields), data=None) + def get_card_idCard(self, idCard, board_id, attachments=None, attachment_fields=None, actions=None, actions_limit=None, action_fields=None, members=None, member_fields=None, checkItemStates=None, checkItemState_fields=None, labels=None, checklists=None, checklist_fields=None, fields=None): + resp = requests.get("https://trello.com/1/boards/%s/cards/%s" % (board_id, idCard), params=dict(key=self._apikey, token=self._token, attachments=attachments, attachment_fields=attachment_fields, actions=actions, actions_limit=actions_limit, action_fields=action_fields, members=members, member_fields=member_fields, checkItemStates=checkItemStates, checkItemState_fields=checkItemState_fields, labels=labels, checklists=checklists, checklist_fields=checklist_fields, fields=fields), data=None) resp.raise_for_status() return json.loads(resp.content) @@ -88,8 +88,8 @@ resp.raise_for_status() return json.loads(resp.content) - def update(self, board_id, name=None, desc=None, closed=None): - resp = requests.put("https://trello.com/1/boards/%s" % (board_id), params=dict(key=self._apikey, token=self._token), data=dict(name=name, desc=desc, closed=closed)) + def update(self, board_id, name=None, desc=None, closed=None, idOrganization=None, prefs/permissionLevel=None, prefs/selfJoin=None, prefs/cardCovers=None, prefs/invitations=None, prefs/voting=None, prefs/comments=None): + resp = requests.put("https://trello.com/1/boards/%s" % (board_id), params=dict(key=self._apikey, token=self._token), data=dict(name=name, desc=desc, closed=closed, idOrganization=idOrganization, prefs/permissionLevel=prefs/permissionLevel, prefs/selfJoin=prefs/selfJoin, prefs/cardCovers=prefs/cardCovers, prefs/invitations=prefs/invitations, prefs/voting=prefs/voting, prefs/comments=prefs/comments)) resp.raise_for_status() return json.loads(resp.content) @@ -103,13 +103,48 @@ resp.raise_for_status() return json.loads(resp.content) + def update_idOrganization(self, board_id, value): + resp = requests.put("https://trello.com/1/boards/%s/idOrganization" % (board_id), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) + resp.raise_for_status() + return json.loads(resp.content) + def update_name(self, board_id, value): resp = requests.put("https://trello.com/1/boards/%s/name" % (board_id), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) resp.raise_for_status() return json.loads(resp.content) - def new(self, name, desc=None, idOrganization=None): - resp = requests.post("https://trello.com/1/boards" % (), params=dict(key=self._apikey, token=self._token), data=dict(name=name, desc=desc, idOrganization=idOrganization)) + def update_pref_cardCover(self, board_id, value): + resp = requests.put("https://trello.com/1/boards/%s/prefs/cardCovers" % (board_id), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) + resp.raise_for_status() + return json.loads(resp.content) + + def update_pref_comment(self, board_id, value): + resp = requests.put("https://trello.com/1/boards/%s/prefs/comments" % (board_id), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) + resp.raise_for_status() + return json.loads(resp.content) + + def update_pref_invitation(self, board_id, value): + resp = requests.put("https://trello.com/1/boards/%s/prefs/invitations" % (board_id), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) + resp.raise_for_status() + return json.loads(resp.content) + + def update_pref_permissionLevel(self, board_id, value): + resp = requests.put("https://trello.com/1/boards/%s/prefs/permissionLevel" % (board_id), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) + resp.raise_for_status() + return json.loads(resp.content) + + def update_pref_selfJoin(self, board_id, value): + resp = requests.put("https://trello.com/1/boards/%s/prefs/selfJoin" % (board_id), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) + resp.raise_for_status() + return json.loads(resp.content) + + def update_pref_voting(self, board_id, value): + resp = requests.put("https://trello.com/1/boards/%s/prefs/voting" % (board_id), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) + resp.raise_for_status() + return json.loads(resp.content) + + def new(self, name, desc=None, idOrganization=None, idBoardSource=None, keepFromSource=None, prefs_permissionLevel=None, prefs_voting=None, prefs_comments=None, prefs_invitations=None, prefs_selfJoin=None, prefs_cardCovers=None): + resp = requests.post("https://trello.com/1/boards" % (), params=dict(key=self._apikey, token=self._token), data=dict(name=name, desc=desc, idOrganization=idOrganization, idBoardSource=idBoardSource, keepFromSource=keepFromSource, prefs_permissionLevel=prefs_permissionLevel, prefs_voting=prefs_voting, prefs_comments=prefs_comments, prefs_invitations=prefs_invitations, prefs_selfJoin=prefs_selfJoin, prefs_cardCovers=prefs_cardCovers)) resp.raise_for_status() return json.loads(resp.content) @@ -123,9 +158,19 @@ resp.raise_for_status() return json.loads(resp.content) + def new_markAsViewed(self, board_id): + resp = requests.post("https://trello.com/1/boards/%s/markAsViewed" % (board_id), params=dict(key=self._apikey, token=self._token), data=None) + resp.raise_for_status() + return json.loads(resp.content) + def new_myPref(self, board_id, name, value): resp = requests.post("https://trello.com/1/boards/%s/myPrefs" % (board_id), params=dict(key=self._apikey, token=self._token), data=dict(name=name, value=value)) resp.raise_for_status() return json.loads(resp.content) + def delete_member_idMember(self, idMember, board_id): + resp = requests.delete("https://trello.com/1/boards/%s/members/%s" % (board_id, idMember), params=dict(key=self._apikey, token=self._token), data=None) + resp.raise_for_status() + return json.loads(resp.content) + diff --git a/trello/cards.py b/trello/cards.py --- a/trello/cards.py +++ b/trello/cards.py @@ -8,148 +8,188 @@ self._apikey = apikey self._token = token - def get(self, card_id, actions=None, action_fields=None, action_limit=None, attachments=None, attachment_fields=None, members=None, member_fields=None, checkItemStates=None, checkItemState_fields=None, checklists=None, checklist_fields=None, fields=None): - resp = requests.get("https://trello.com/1/cards/%s" % (card_id), params=dict(key=self._apikey, token=self._token, actions=actions, action_fields=action_fields, action_limit=action_limit, attachments=attachments, attachment_fields=attachment_fields, members=members, member_fields=member_fields, checkItemStates=checkItemStates, checkItemState_fields=checkItemState_fields, checklists=checklists, checklist_fields=checklist_fields, fields=fields), data=None) + def get(self, card_id_or_shortlink, actions=None, actions_limit=None, action_fields=None, attachments=None, attachment_fields=None, members=None, member_fields=None, checkItemStates=None, checkItemState_fields=None, checklists=None, checklist_fields=None, board=None, board_fields=None, list=None, list_fields=None, fields=None): + resp = requests.get("https://trello.com/1/cards/%s" % (card_id_or_shortlink), params=dict(key=self._apikey, token=self._token, actions=actions, actions_limit=actions_limit, action_fields=action_fields, attachments=attachments, attachment_fields=attachment_fields, members=members, member_fields=member_fields, checkItemStates=checkItemStates, checkItemState_fields=checkItemState_fields, checklists=checklists, checklist_fields=checklist_fields, board=board, board_fields=board_fields, list=list, list_fields=list_fields, fields=fields), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_field(self, field, card_id): - resp = requests.get("https://trello.com/1/cards/%s/%s" % (card_id, field), params=dict(key=self._apikey, token=self._token), data=None) + def get_field(self, field, card_id_or_shortlink): + resp = requests.get("https://trello.com/1/cards/%s/%s" % (card_id_or_shortlink, field), params=dict(key=self._apikey, token=self._token), data=None) + resp.raise_for_status() + return json.loads(resp.content) + + def get_action(self, card_id_or_shortlink, filter=None, fields=None, limit=None, format=None, since=None, page=None, idModels=None): + resp = requests.get("https://trello.com/1/cards/%s/actions" % (card_id_or_shortlink), params=dict(key=self._apikey, token=self._token, filter=filter, fields=fields, limit=limit, format=format, since=since, page=page, idModels=idModels), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_action(self, card_id, filter=None, fields=None, limit=None, page=None, idModels=None): - resp = requests.get("https://trello.com/1/cards/%s/actions" % (card_id), params=dict(key=self._apikey, token=self._token, filter=filter, fields=fields, limit=limit, page=page, idModels=idModels), data=None) + def get_attachment(self, card_id_or_shortlink, fields=None): + resp = requests.get("https://trello.com/1/cards/%s/attachments" % (card_id_or_shortlink), params=dict(key=self._apikey, token=self._token, fields=fields), data=None) + resp.raise_for_status() + return json.loads(resp.content) + + def get_board(self, card_id_or_shortlink, fields=None): + resp = requests.get("https://trello.com/1/cards/%s/board" % (card_id_or_shortlink), params=dict(key=self._apikey, token=self._token, fields=fields), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_attachment(self, card_id, fields=None): - resp = requests.get("https://trello.com/1/cards/%s/attachments" % (card_id), params=dict(key=self._apikey, token=self._token, fields=fields), data=None) + def get_board_field(self, field, card_id_or_shortlink): + resp = requests.get("https://trello.com/1/cards/%s/board/%s" % (card_id_or_shortlink, field), params=dict(key=self._apikey, token=self._token), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_board(self, card_id, fields=None): - resp = requests.get("https://trello.com/1/cards/%s/board" % (card_id), params=dict(key=self._apikey, token=self._token, fields=fields), data=None) + def get_checkItemState(self, card_id_or_shortlink, fields=None): + resp = requests.get("https://trello.com/1/cards/%s/checkItemStates" % (card_id_or_shortlink), params=dict(key=self._apikey, token=self._token, fields=fields), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_board_field(self, field, card_id): - resp = requests.get("https://trello.com/1/cards/%s/board/%s" % (card_id, field), params=dict(key=self._apikey, token=self._token), data=None) + def get_checklist(self, card_id_or_shortlink, cards=None, card_fields=None, checkItems=None, checkItem_fields=None, filter=None, fields=None): + resp = requests.get("https://trello.com/1/cards/%s/checklists" % (card_id_or_shortlink), params=dict(key=self._apikey, token=self._token, cards=cards, card_fields=card_fields, checkItems=checkItems, checkItem_fields=checkItem_fields, filter=filter, fields=fields), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_checkItemState(self, card_id, fields=None): - resp = requests.get("https://trello.com/1/cards/%s/checkItemStates" % (card_id), params=dict(key=self._apikey, token=self._token, fields=fields), data=None) + def get_list(self, card_id_or_shortlink, fields=None): + resp = requests.get("https://trello.com/1/cards/%s/list" % (card_id_or_shortlink), params=dict(key=self._apikey, token=self._token, fields=fields), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_checklist(self, card_id, cards=None, card_fields=None, checkItems=None, checkItem_fields=None, filter=None, fields=None): - resp = requests.get("https://trello.com/1/cards/%s/checklists" % (card_id), params=dict(key=self._apikey, token=self._token, cards=cards, card_fields=card_fields, checkItems=checkItems, checkItem_fields=checkItem_fields, filter=filter, fields=fields), data=None) + def get_list_field(self, field, card_id_or_shortlink): + resp = requests.get("https://trello.com/1/cards/%s/list/%s" % (card_id_or_shortlink, field), params=dict(key=self._apikey, token=self._token), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_list(self, card_id, fields=None): - resp = requests.get("https://trello.com/1/cards/%s/list" % (card_id), params=dict(key=self._apikey, token=self._token, fields=fields), data=None) + def get_member(self, card_id_or_shortlink, fields=None): + resp = requests.get("https://trello.com/1/cards/%s/members" % (card_id_or_shortlink), params=dict(key=self._apikey, token=self._token, fields=fields), data=None) + resp.raise_for_status() + return json.loads(resp.content) + + def get_membersVoted(self, card_id_or_shortlink, fields=None): + resp = requests.get("https://trello.com/1/cards/%s/membersVoted" % (card_id_or_shortlink), params=dict(key=self._apikey, token=self._token, fields=fields), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_list_field(self, field, card_id): - resp = requests.get("https://trello.com/1/cards/%s/list/%s" % (card_id, field), params=dict(key=self._apikey, token=self._token), data=None) + def update(self, card_id_or_shortlink, name=None, desc=None, closed=None, idAttachmentCover=None, idList=None, pos=None, due=None, subscribed=None): + resp = requests.put("https://trello.com/1/cards/%s" % (card_id_or_shortlink), params=dict(key=self._apikey, token=self._token), data=dict(name=name, desc=desc, closed=closed, idAttachmentCover=idAttachmentCover, idList=idList, pos=pos, due=due, subscribed=subscribed)) resp.raise_for_status() return json.loads(resp.content) - def get_member(self, card_id, fields=None): - resp = requests.get("https://trello.com/1/cards/%s/members" % (card_id), params=dict(key=self._apikey, token=self._token, fields=fields), data=None) + def update_checklist_checkItem_name_idCheckList_idCheckItem(self, idCheckList, idCheckItem, card_id_or_shortlink, value): + resp = requests.put("https://trello.com/1/cards/%s/checklist/%s/checkItem/%s/name" % (card_id_or_shortlink, idCheckList, idCheckItem), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) resp.raise_for_status() return json.loads(resp.content) - def update(self, card_id, name=None, desc=None, closed=None, idList=None, due=None): - resp = requests.put("https://trello.com/1/cards/%s" % (card_id), params=dict(key=self._apikey, token=self._token), data=dict(name=name, desc=desc, closed=closed, idList=idList, due=due)) + def update_checklist_checkItem_po_idCheckList_idCheckItem(self, idCheckList, idCheckItem, card_id_or_shortlink, value): + resp = requests.put("https://trello.com/1/cards/%s/checklist/%s/checkItem/%s/pos" % (card_id_or_shortlink, idCheckList, idCheckItem), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) resp.raise_for_status() return json.loads(resp.content) - def update_closed(self, card_id, value): - resp = requests.put("https://trello.com/1/cards/%s/closed" % (card_id), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) + def update_checklist_checkItem_state_idCheckList_idCheckItem(self, idCheckList, idCheckItem, card_id_or_shortlink, value): + resp = requests.put("https://trello.com/1/cards/%s/checklist/%s/checkItem/%s/state" % (card_id_or_shortlink, idCheckList, idCheckItem), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) resp.raise_for_status() return json.loads(resp.content) - def update_desc(self, card_id, value): - resp = requests.put("https://trello.com/1/cards/%s/desc" % (card_id), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) + def update_closed(self, card_id_or_shortlink, value): + resp = requests.put("https://trello.com/1/cards/%s/closed" % (card_id_or_shortlink), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) + resp.raise_for_status() + return json.loads(resp.content) + + def update_desc(self, card_id_or_shortlink, value): + resp = requests.put("https://trello.com/1/cards/%s/desc" % (card_id_or_shortlink), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) resp.raise_for_status() return json.loads(resp.content) - def update_due(self, card_id, value): - resp = requests.put("https://trello.com/1/cards/%s/due" % (card_id), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) + def update_due(self, card_id_or_shortlink, value): + resp = requests.put("https://trello.com/1/cards/%s/due" % (card_id_or_shortlink), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) resp.raise_for_status() return json.loads(resp.content) - def update_idList(self, card_id, value): - resp = requests.put("https://trello.com/1/cards/%s/idList" % (card_id), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) + def update_idAttachmentCover(self, card_id_or_shortlink, value): + resp = requests.put("https://trello.com/1/cards/%s/idAttachmentCover" % (card_id_or_shortlink), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) resp.raise_for_status() return json.loads(resp.content) - def update_name(self, card_id, value): - resp = requests.put("https://trello.com/1/cards/%s/name" % (card_id), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) + def update_idList(self, card_id_or_shortlink, value): + resp = requests.put("https://trello.com/1/cards/%s/idList" % (card_id_or_shortlink), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) + resp.raise_for_status() + return json.loads(resp.content) + + def update_name(self, card_id_or_shortlink, value): + resp = requests.put("https://trello.com/1/cards/%s/name" % (card_id_or_shortlink), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) resp.raise_for_status() return json.loads(resp.content) - def new(self, name, idList, desc=None): - resp = requests.post("https://trello.com/1/cards" % (), params=dict(key=self._apikey, token=self._token), data=dict(name=name, idList=idList, desc=desc)) + def update_po(self, card_id_or_shortlink, value): + resp = requests.put("https://trello.com/1/cards/%s/pos" % (card_id_or_shortlink), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) + resp.raise_for_status() + return json.loads(resp.content) + + def update_subscribed(self, card_id_or_shortlink, value): + resp = requests.put("https://trello.com/1/cards/%s/subscribed" % (card_id_or_shortlink), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) resp.raise_for_status() return json.loads(resp.content) - def new_action_comment(self, card_id, text): - resp = requests.post("https://trello.com/1/cards/%s/actions/comments" % (card_id), params=dict(key=self._apikey, token=self._token), data=dict(text=text)) + def new(self, name, idList, desc=None, pos=None, idCardSource=None, keepFromSource=None): + resp = requests.post("https://trello.com/1/cards" % (), params=dict(key=self._apikey, token=self._token), data=dict(name=name, idList=idList, desc=desc, pos=pos, idCardSource=idCardSource, keepFromSource=keepFromSource)) resp.raise_for_status() return json.loads(resp.content) - def new_attachment(self, card_id, url, name): - resp = requests.post("https://trello.com/1/cards/%s/attachments" % (card_id), params=dict(key=self._apikey, token=self._token), data=dict(url=url, name=name)) + def new_action_comment(self, card_id_or_shortlink, text): + resp = requests.post("https://trello.com/1/cards/%s/actions/comments" % (card_id_or_shortlink), params=dict(key=self._apikey, token=self._token), data=dict(text=text)) resp.raise_for_status() return json.loads(resp.content) - def new_checklist(self, card_id, value): - resp = requests.post("https://trello.com/1/cards/%s/checklists" % (card_id), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) + def new_attachment(self, card_id_or_shortlink, file=None, url=None, name=None): + resp = requests.post("https://trello.com/1/cards/%s/attachments" % (card_id_or_shortlink), params=dict(key=self._apikey, token=self._token), data=dict(file=file, url=url, name=name)) resp.raise_for_status() return json.loads(resp.content) - def new_label(self, card_id, value): - resp = requests.post("https://trello.com/1/cards/%s/labels" % (card_id), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) + def new_checklist(self, card_id_or_shortlink, value): + resp = requests.post("https://trello.com/1/cards/%s/checklists" % (card_id_or_shortlink), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) resp.raise_for_status() return json.loads(resp.content) - def new_member(self, card_id, value): - resp = requests.post("https://trello.com/1/cards/%s/members" % (card_id), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) + def new_label(self, card_id_or_shortlink, value): + resp = requests.post("https://trello.com/1/cards/%s/labels" % (card_id_or_shortlink), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) resp.raise_for_status() return json.loads(resp.content) - def new_membersVoted(self, card_id, value): - resp = requests.post("https://trello.com/1/cards/%s/membersVoted" % (card_id), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) + def new_member(self, card_id_or_shortlink, value): + resp = requests.post("https://trello.com/1/cards/%s/members" % (card_id_or_shortlink), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) + resp.raise_for_status() + return json.loads(resp.content) + + def new_membersVoted(self, card_id_or_shortlink, value): + resp = requests.post("https://trello.com/1/cards/%s/membersVoted" % (card_id_or_shortlink), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) resp.raise_for_status() return json.loads(resp.content) - def delete(self, card_id): - resp = requests.delete("https://trello.com/1/cards/%s" % (card_id), params=dict(key=self._apikey, token=self._token), data=None) + def delete(self, card_id_or_shortlink): + resp = requests.delete("https://trello.com/1/cards/%s" % (card_id_or_shortlink), params=dict(key=self._apikey, token=self._token), data=None) resp.raise_for_status() return json.loads(resp.content) - def delete_checklist_idChecklist(self, idChecklist, card_id): - resp = requests.delete("https://trello.com/1/cards/%s/checklists/%s" % (card_id, idChecklist), params=dict(key=self._apikey, token=self._token), data=None) + def delete_attachment_idAttachment(self, idAttachment, card_id_or_shortlink): + resp = requests.delete("https://trello.com/1/cards/%s/attachments/%s" % (card_id_or_shortlink, idAttachment), params=dict(key=self._apikey, token=self._token), data=None) resp.raise_for_status() return json.loads(resp.content) - def delete_label_color(self, color, card_id): - resp = requests.delete("https://trello.com/1/cards/%s/labels/%s" % (card_id, color), params=dict(key=self._apikey, token=self._token), data=None) + def delete_checklist_idChecklist(self, idChecklist, card_id_or_shortlink): + resp = requests.delete("https://trello.com/1/cards/%s/checklists/%s" % (card_id_or_shortlink, idChecklist), params=dict(key=self._apikey, token=self._token), data=None) resp.raise_for_status() return json.loads(resp.content) - def delete_member_idMember(self, idMember, card_id): - resp = requests.delete("https://trello.com/1/cards/%s/members/%s" % (card_id, idMember), params=dict(key=self._apikey, token=self._token), data=None) + def delete_label_color(self, color, card_id_or_shortlink): + resp = requests.delete("https://trello.com/1/cards/%s/labels/%s" % (card_id_or_shortlink, color), params=dict(key=self._apikey, token=self._token), data=None) resp.raise_for_status() return json.loads(resp.content) - def delete_membersVoted_idMember(self, idMember, card_id): - resp = requests.delete("https://trello.com/1/cards/%s/membersVoted/%s" % (card_id, idMember), params=dict(key=self._apikey, token=self._token), data=None) + def delete_member_idMember(self, idMember, card_id_or_shortlink): + resp = requests.delete("https://trello.com/1/cards/%s/members/%s" % (card_id_or_shortlink, idMember), params=dict(key=self._apikey, token=self._token), data=None) + resp.raise_for_status() + return json.loads(resp.content) + + def delete_membersVoted_idMember(self, idMember, card_id_or_shortlink): + resp = requests.delete("https://trello.com/1/cards/%s/membersVoted/%s" % (card_id_or_shortlink, idMember), params=dict(key=self._apikey, token=self._token), data=None) resp.raise_for_status() return json.loads(resp.content) diff --git a/trello/checklists.py b/trello/checklists.py --- a/trello/checklists.py +++ b/trello/checklists.py @@ -8,48 +8,48 @@ self._apikey = apikey self._token = token - def get(self, checklist_id, cards=None, card_fields=None, checkItems=None, checkItem_fields=None, fields=None): - resp = requests.get("https://trello.com/1/checklists/%s" % (checklist_id), params=dict(key=self._apikey, token=self._token, cards=cards, card_fields=card_fields, checkItems=checkItems, checkItem_fields=checkItem_fields, fields=fields), data=None) + def get(self, idChecklist, cards=None, card_fields=None, checkItems=None, checkItem_fields=None, fields=None): + resp = requests.get("https://trello.com/1/checklists/%s" % (idChecklist), params=dict(key=self._apikey, token=self._token, cards=cards, card_fields=card_fields, checkItems=checkItems, checkItem_fields=checkItem_fields, fields=fields), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_field(self, field, checklist_id): - resp = requests.get("https://trello.com/1/checklists/%s/%s" % (checklist_id, field), params=dict(key=self._apikey, token=self._token), data=None) + def get_field(self, field, idChecklist): + resp = requests.get("https://trello.com/1/checklists/%s/%s" % (idChecklist, field), params=dict(key=self._apikey, token=self._token), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_board(self, checklist_id, fields=None): - resp = requests.get("https://trello.com/1/checklists/%s/board" % (checklist_id), params=dict(key=self._apikey, token=self._token, fields=fields), data=None) + def get_board(self, idChecklist, fields=None): + resp = requests.get("https://trello.com/1/checklists/%s/board" % (idChecklist), params=dict(key=self._apikey, token=self._token, fields=fields), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_board_field(self, field, checklist_id): - resp = requests.get("https://trello.com/1/checklists/%s/board/%s" % (checklist_id, field), params=dict(key=self._apikey, token=self._token), data=None) + def get_board_field(self, field, idChecklist): + resp = requests.get("https://trello.com/1/checklists/%s/board/%s" % (idChecklist, field), params=dict(key=self._apikey, token=self._token), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_card(self, checklist_id, actions=None, attachments=None, members=None, checkItemStates=None, checklists=None, filter=None, fields=None): - resp = requests.get("https://trello.com/1/checklists/%s/cards" % (checklist_id), params=dict(key=self._apikey, token=self._token, actions=actions, attachments=attachments, members=members, checkItemStates=checkItemStates, checklists=checklists, filter=filter, fields=fields), data=None) + def get_card(self, idChecklist, actions=None, attachments=None, attachment_fields=None, members=None, member_fields=None, checkItemStates=None, checklists=None, filter=None, fields=None): + resp = requests.get("https://trello.com/1/checklists/%s/cards" % (idChecklist), params=dict(key=self._apikey, token=self._token, actions=actions, attachments=attachments, attachment_fields=attachment_fields, members=members, member_fields=member_fields, checkItemStates=checkItemStates, checklists=checklists, filter=filter, fields=fields), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_card_filter(self, filter, checklist_id): - resp = requests.get("https://trello.com/1/checklists/%s/cards/%s" % (checklist_id, filter), params=dict(key=self._apikey, token=self._token), data=None) + def get_card_filter(self, filter, idChecklist): + resp = requests.get("https://trello.com/1/checklists/%s/cards/%s" % (idChecklist, filter), params=dict(key=self._apikey, token=self._token), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_checkItem(self, checklist_id, filter=None, fields=None): - resp = requests.get("https://trello.com/1/checklists/%s/checkItems" % (checklist_id), params=dict(key=self._apikey, token=self._token, filter=filter, fields=fields), data=None) + def get_checkItem(self, idChecklist, filter=None, fields=None): + resp = requests.get("https://trello.com/1/checklists/%s/checkItems" % (idChecklist), params=dict(key=self._apikey, token=self._token, filter=filter, fields=fields), data=None) resp.raise_for_status() return json.loads(resp.content) - def update(self, checklist_id, name=None): - resp = requests.put("https://trello.com/1/checklists/%s" % (checklist_id), params=dict(key=self._apikey, token=self._token), data=dict(name=name)) + def update(self, idChecklist, name=None): + resp = requests.put("https://trello.com/1/checklists/%s" % (idChecklist), params=dict(key=self._apikey, token=self._token), data=dict(name=name)) resp.raise_for_status() return json.loads(resp.content) - def update_name(self, checklist_id, value): - resp = requests.put("https://trello.com/1/checklists/%s/name" % (checklist_id), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) + def update_name(self, idChecklist, value): + resp = requests.put("https://trello.com/1/checklists/%s/name" % (idChecklist), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) resp.raise_for_status() return json.loads(resp.content) @@ -58,13 +58,13 @@ resp.raise_for_status() return json.loads(resp.content) - def new_checkItem(self, checklist_id, name): - resp = requests.post("https://trello.com/1/checklists/%s/checkItems" % (checklist_id), params=dict(key=self._apikey, token=self._token), data=dict(name=name)) + def new_checkItem(self, idChecklist, name): + resp = requests.post("https://trello.com/1/checklists/%s/checkItems" % (idChecklist), params=dict(key=self._apikey, token=self._token), data=dict(name=name)) resp.raise_for_status() return json.loads(resp.content) - def delete_checkItem_idCheckItem(self, idCheckItem, checklist_id): - resp = requests.delete("https://trello.com/1/checklists/%s/checkItems/%s" % (checklist_id, idCheckItem), params=dict(key=self._apikey, token=self._token), data=None) + def delete_checkItem_idCheckItem(self, idCheckItem, idChecklist): + resp = requests.delete("https://trello.com/1/checklists/%s/checkItems/%s" % (idChecklist, idCheckItem), params=dict(key=self._apikey, token=self._token), data=None) resp.raise_for_status() return json.loads(resp.content) diff --git a/trello/devices.py b/trello/devices.py new file mode 100644 --- /dev/null +++ b/trello/devices.py @@ -0,0 +1,26 @@ +import json +import requests + +class Devices(object): + __module__ = 'trello' + + def __init__(self, apikey, token=None): + self._apikey = apikey + self._token = token + + def get_field(self, field, idDevice): + resp = requests.get("https://trello.com/1/devices/%s/%s" % (idDevice, field), params=dict(key=self._apikey, token=self._token), data=None) + resp.raise_for_status() + return json.loads(resp.content) + + def get_member(self, idDevice, fields=None): + resp = requests.get("https://trello.com/1/devices/%s/member" % (idDevice), params=dict(key=self._apikey, token=self._token, fields=fields), data=None) + resp.raise_for_status() + return json.loads(resp.content) + + def get_member_field(self, field, idDevice): + resp = requests.get("https://trello.com/1/devices/%s/member/%s" % (idDevice, field), params=dict(key=self._apikey, token=self._token), data=None) + resp.raise_for_status() + return json.loads(resp.content) + + diff --git a/trello/lists.py b/trello/lists.py --- a/trello/lists.py +++ b/trello/lists.py @@ -8,53 +8,58 @@ self._apikey = apikey self._token = token - def get(self, list_id, cards=None, card_fields=None, fields=None): - resp = requests.get("https://trello.com/1/lists/%s" % (list_id), params=dict(key=self._apikey, token=self._token, cards=cards, card_fields=card_fields, fields=fields), data=None) + def get(self, idList, cards=None, card_fields=None, fields=None): + resp = requests.get("https://trello.com/1/lists/%s" % (idList), params=dict(key=self._apikey, token=self._token, cards=cards, card_fields=card_fields, fields=fields), data=None) + resp.raise_for_status() + return json.loads(resp.content) + + def get_field(self, field, idList): + resp = requests.get("https://trello.com/1/lists/%s/%s" % (idList, field), params=dict(key=self._apikey, token=self._token), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_field(self, field, list_id): - resp = requests.get("https://trello.com/1/lists/%s/%s" % (list_id, field), params=dict(key=self._apikey, token=self._token), data=None) + def get_action(self, idList, filter=None, fields=None, limit=None, format=None, since=None, page=None, idModels=None): + resp = requests.get("https://trello.com/1/lists/%s/actions" % (idList), params=dict(key=self._apikey, token=self._token, filter=filter, fields=fields, limit=limit, format=format, since=since, page=page, idModels=idModels), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_action(self, list_id, filter=None, fields=None, limit=None, page=None, idModels=None): - resp = requests.get("https://trello.com/1/lists/%s/actions" % (list_id), params=dict(key=self._apikey, token=self._token, filter=filter, fields=fields, limit=limit, page=page, idModels=idModels), data=None) + def get_board(self, idList, fields=None): + resp = requests.get("https://trello.com/1/lists/%s/board" % (idList), params=dict(key=self._apikey, token=self._token, fields=fields), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_board(self, list_id, fields=None): - resp = requests.get("https://trello.com/1/lists/%s/board" % (list_id), params=dict(key=self._apikey, token=self._token, fields=fields), data=None) + def get_board_field(self, field, idList): + resp = requests.get("https://trello.com/1/lists/%s/board/%s" % (idList, field), params=dict(key=self._apikey, token=self._token), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_board_field(self, field, list_id): - resp = requests.get("https://trello.com/1/lists/%s/board/%s" % (list_id, field), params=dict(key=self._apikey, token=self._token), data=None) + def get_card(self, idList, actions=None, attachments=None, attachment_fields=None, members=None, member_fields=None, checkItemStates=None, checklists=None, filter=None, fields=None): + resp = requests.get("https://trello.com/1/lists/%s/cards" % (idList), params=dict(key=self._apikey, token=self._token, actions=actions, attachments=attachments, attachment_fields=attachment_fields, members=members, member_fields=member_fields, checkItemStates=checkItemStates, checklists=checklists, filter=filter, fields=fields), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_card(self, list_id, actions=None, attachments=None, members=None, checkItemStates=None, checklists=None, filter=None, fields=None): - resp = requests.get("https://trello.com/1/lists/%s/cards" % (list_id), params=dict(key=self._apikey, token=self._token, actions=actions, attachments=attachments, members=members, checkItemStates=checkItemStates, checklists=checklists, filter=filter, fields=fields), data=None) + def get_card_filter(self, filter, idList): + resp = requests.get("https://trello.com/1/lists/%s/cards/%s" % (idList, filter), params=dict(key=self._apikey, token=self._token), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_card_filter(self, filter, list_id): - resp = requests.get("https://trello.com/1/lists/%s/cards/%s" % (list_id, filter), params=dict(key=self._apikey, token=self._token), data=None) + def update(self, idList, name=None, closed=None, pos=None): + resp = requests.put("https://trello.com/1/lists/%s" % (idList), params=dict(key=self._apikey, token=self._token), data=dict(name=name, closed=closed, pos=pos)) resp.raise_for_status() return json.loads(resp.content) - def update(self, list_id, name=None, closed=None): - resp = requests.put("https://trello.com/1/lists/%s" % (list_id), params=dict(key=self._apikey, token=self._token), data=dict(name=name, closed=closed)) + def update_closed(self, idList, value): + resp = requests.put("https://trello.com/1/lists/%s/closed" % (idList), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) resp.raise_for_status() return json.loads(resp.content) - def update_closed(self, list_id, value): - resp = requests.put("https://trello.com/1/lists/%s/closed" % (list_id), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) + def update_name(self, idList, value): + resp = requests.put("https://trello.com/1/lists/%s/name" % (idList), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) resp.raise_for_status() return json.loads(resp.content) - def update_name(self, list_id, value): - resp = requests.put("https://trello.com/1/lists/%s/name" % (list_id), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) + def update_po(self, idList, value): + resp = requests.put("https://trello.com/1/lists/%s/pos" % (idList), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) resp.raise_for_status() return json.loads(resp.content) @@ -63,8 +68,8 @@ resp.raise_for_status() return json.loads(resp.content) - def new_card(self, list_id, name, desc=None): - resp = requests.post("https://trello.com/1/lists/%s/cards" % (list_id), params=dict(key=self._apikey, token=self._token), data=dict(name=name, desc=desc)) + def new_card(self, idList, name, desc=None): + resp = requests.post("https://trello.com/1/lists/%s/cards" % (idList), params=dict(key=self._apikey, token=self._token), data=dict(name=name, desc=desc)) resp.raise_for_status() return json.loads(resp.content) diff --git a/trello/members.py b/trello/members.py --- a/trello/members.py +++ b/trello/members.py @@ -8,98 +8,103 @@ self._apikey = apikey self._token = token - def get(self, member_id_or_username, actions=None, action_fields=None, action_limit=None, cards=None, card_fields=None, boards=None, board_fields=None, boardsInvited=None, boardsInvited_fields=None, organizations=None, organization_fields=None, organizationsInvited=None, organizationsInvited_fields=None, notifications=None, notification_fields=None, notification_limit=None, fields=None): - resp = requests.get("https://trello.com/1/members/%s" % (member_id_or_username), params=dict(key=self._apikey, token=self._token, actions=actions, action_fields=action_fields, action_limit=action_limit, cards=cards, card_fields=card_fields, boards=boards, board_fields=board_fields, boardsInvited=boardsInvited, boardsInvited_fields=boardsInvited_fields, organizations=organizations, organization_fields=organization_fields, organizationsInvited=organizationsInvited, organizationsInvited_fields=organizationsInvited_fields, notifications=notifications, notification_fields=notification_fields, notification_limit=notification_limit, fields=fields), data=None) + def get(self, idMember_or_username, actions=None, actions_limit=None, action_fields=None, cards=None, card_fields=None, card_members=None, card_member_fields=None, card_attachments=None, card_attachment_fields=None, boards=None, board_fields=None, board_actions=None, board_actions_format=None, board_actions_since=None, board_actions_limit=None, board_action_fields=None, board_lists=None, boardsInvited=None, boardsInvited_fields=None, organizations=None, organization_fields=None, organizationsInvited=None, organizationsInvited_fields=None, notifications=None, notifications_limit=None, notification_fields=None, tokens=None, fields=None): + resp = requests.get("https://trello.com/1/members/%s" % (idMember_or_username), params=dict(key=self._apikey, token=self._token, actions=actions, actions_limit=actions_limit, action_fields=action_fields, cards=cards, card_fields=card_fields, card_members=card_members, card_member_fields=card_member_fields, card_attachments=card_attachments, card_attachment_fields=card_attachment_fields, boards=boards, board_fields=board_fields, board_actions=board_actions, board_actions_format=board_actions_format, board_actions_since=board_actions_since, board_actions_limit=board_actions_limit, board_action_fields=board_action_fields, board_lists=board_lists, boardsInvited=boardsInvited, boardsInvited_fields=boardsInvited_fields, organizations=organizations, organization_fields=organization_fields, organizationsInvited=organizationsInvited, organizationsInvited_fields=organizationsInvited_fields, notifications=notifications, notifications_limit=notifications_limit, notification_fields=notification_fields, tokens=tokens, fields=fields), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_field(self, field, member_id_or_username): - resp = requests.get("https://trello.com/1/members/%s/%s" % (member_id_or_username, field), params=dict(key=self._apikey, token=self._token), data=None) + def get_field(self, field, idMember_or_username): + resp = requests.get("https://trello.com/1/members/%s/%s" % (idMember_or_username, field), params=dict(key=self._apikey, token=self._token), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_action(self, member_id_or_username, filter=None, fields=None, limit=None, page=None, idModels=None): - resp = requests.get("https://trello.com/1/members/%s/actions" % (member_id_or_username), params=dict(key=self._apikey, token=self._token, filter=filter, fields=fields, limit=limit, page=page, idModels=idModels), data=None) + def get_action(self, idMember_or_username, filter=None, fields=None, limit=None, format=None, since=None, page=None, idModels=None): + resp = requests.get("https://trello.com/1/members/%s/actions" % (idMember_or_username), params=dict(key=self._apikey, token=self._token, filter=filter, fields=fields, limit=limit, format=format, since=since, page=page, idModels=idModels), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_board(self, member_id_or_username, filter=None, fields=None, actions=None, action_fields=None, action_limit=None): - resp = requests.get("https://trello.com/1/members/%s/boards" % (member_id_or_username), params=dict(key=self._apikey, token=self._token, filter=filter, fields=fields, actions=actions, action_fields=action_fields, action_limit=action_limit), data=None) + def get_board(self, idMember_or_username, filter=None, fields=None, actions=None, actions_limit=None, actions_format=None, actions_since=None, action_fields=None, lists=None): + resp = requests.get("https://trello.com/1/members/%s/boards" % (idMember_or_username), params=dict(key=self._apikey, token=self._token, filter=filter, fields=fields, actions=actions, actions_limit=actions_limit, actions_format=actions_format, actions_since=actions_since, action_fields=action_fields, lists=lists), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_board_filter(self, filter, member_id_or_username): - resp = requests.get("https://trello.com/1/members/%s/boards/%s" % (member_id_or_username, filter), params=dict(key=self._apikey, token=self._token), data=None) + def get_board_filter(self, filter, idMember_or_username): + resp = requests.get("https://trello.com/1/members/%s/boards/%s" % (idMember_or_username, filter), params=dict(key=self._apikey, token=self._token), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_boardsInvited(self, member_id_or_username, fields=None): - resp = requests.get("https://trello.com/1/members/%s/boardsInvited" % (member_id_or_username), params=dict(key=self._apikey, token=self._token, fields=fields), data=None) + def get_boardsInvited(self, idMember_or_username, fields=None): + resp = requests.get("https://trello.com/1/members/%s/boardsInvited" % (idMember_or_username), params=dict(key=self._apikey, token=self._token, fields=fields), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_boardsInvited_field(self, field, member_id_or_username): - resp = requests.get("https://trello.com/1/members/%s/boardsInvited/%s" % (member_id_or_username, field), params=dict(key=self._apikey, token=self._token), data=None) + def get_boardsInvited_field(self, field, idMember_or_username): + resp = requests.get("https://trello.com/1/members/%s/boardsInvited/%s" % (idMember_or_username, field), params=dict(key=self._apikey, token=self._token), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_card(self, member_id_or_username, actions=None, attachments=None, members=None, checkItemStates=None, checklists=None, filter=None, fields=None): - resp = requests.get("https://trello.com/1/members/%s/cards" % (member_id_or_username), params=dict(key=self._apikey, token=self._token, actions=actions, attachments=attachments, members=members, checkItemStates=checkItemStates, checklists=checklists, filter=filter, fields=fields), data=None) + def get_card(self, idMember_or_username, actions=None, attachments=None, attachment_fields=None, members=None, member_fields=None, checkItemStates=None, checklists=None, filter=None, fields=None): + resp = requests.get("https://trello.com/1/members/%s/cards" % (idMember_or_username), params=dict(key=self._apikey, token=self._token, actions=actions, attachments=attachments, attachment_fields=attachment_fields, members=members, member_fields=member_fields, checkItemStates=checkItemStates, checklists=checklists, filter=filter, fields=fields), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_card_filter(self, filter, member_id_or_username): - resp = requests.get("https://trello.com/1/members/%s/cards/%s" % (member_id_or_username, filter), params=dict(key=self._apikey, token=self._token), data=None) + def get_card_filter(self, filter, idMember_or_username): + resp = requests.get("https://trello.com/1/members/%s/cards/%s" % (idMember_or_username, filter), params=dict(key=self._apikey, token=self._token), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_notification(self, member_id_or_username, filter=None, read_filter=None, fields=None, limit=None, page=None): - resp = requests.get("https://trello.com/1/members/%s/notifications" % (member_id_or_username), params=dict(key=self._apikey, token=self._token, filter=filter, read_filter=read_filter, fields=fields, limit=limit, page=page), data=None) + def get_notification(self, idMember_or_username, filter=None, read_filter=None, fields=None, limit=None, page=None, before=None, since=None): + resp = requests.get("https://trello.com/1/members/%s/notifications" % (idMember_or_username), params=dict(key=self._apikey, token=self._token, filter=filter, read_filter=read_filter, fields=fields, limit=limit, page=page, before=before, since=since), data=None) + resp.raise_for_status() + return json.loads(resp.content) + + def get_notification_filter(self, filter, idMember_or_username): + resp = requests.get("https://trello.com/1/members/%s/notifications/%s" % (idMember_or_username, filter), params=dict(key=self._apikey, token=self._token), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_notification_filter(self, filter, member_id_or_username): - resp = requests.get("https://trello.com/1/members/%s/notifications/%s" % (member_id_or_username, filter), params=dict(key=self._apikey, token=self._token), data=None) + def get_organization(self, idMember_or_username, filter=None, fields=None): + resp = requests.get("https://trello.com/1/members/%s/organizations" % (idMember_or_username), params=dict(key=self._apikey, token=self._token, filter=filter, fields=fields), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_organization(self, member_id_or_username, filter=None, fields=None): - resp = requests.get("https://trello.com/1/members/%s/organizations" % (member_id_or_username), params=dict(key=self._apikey, token=self._token, filter=filter, fields=fields), data=None) + def get_organization_filter(self, filter, idMember_or_username): + resp = requests.get("https://trello.com/1/members/%s/organizations/%s" % (idMember_or_username, filter), params=dict(key=self._apikey, token=self._token), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_organization_filter(self, filter, member_id_or_username): - resp = requests.get("https://trello.com/1/members/%s/organizations/%s" % (member_id_or_username, filter), params=dict(key=self._apikey, token=self._token), data=None) + def get_organizationsInvited(self, idMember_or_username, fields=None): + resp = requests.get("https://trello.com/1/members/%s/organizationsInvited" % (idMember_or_username), params=dict(key=self._apikey, token=self._token, fields=fields), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_organizationsInvited(self, member_id_or_username, fields=None): - resp = requests.get("https://trello.com/1/members/%s/organizationsInvited" % (member_id_or_username), params=dict(key=self._apikey, token=self._token, fields=fields), data=None) + def get_organizationsInvited_field(self, field, idMember_or_username): + resp = requests.get("https://trello.com/1/members/%s/organizationsInvited/%s" % (idMember_or_username, field), params=dict(key=self._apikey, token=self._token), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_organizationsInvited_field(self, field, member_id_or_username): - resp = requests.get("https://trello.com/1/members/%s/organizationsInvited/%s" % (member_id_or_username, field), params=dict(key=self._apikey, token=self._token), data=None) + def get_token(self, idMember_or_username, filter=None): + resp = requests.get("https://trello.com/1/members/%s/tokens" % (idMember_or_username), params=dict(key=self._apikey, token=self._token, filter=filter), data=None) resp.raise_for_status() return json.loads(resp.content) - def update(self, member_id_or_username, fullName=None, initials=None, bio=None): - resp = requests.put("https://trello.com/1/members/%s" % (member_id_or_username), params=dict(key=self._apikey, token=self._token), data=dict(fullName=fullName, initials=initials, bio=bio)) + def update(self, idMember_or_username, fullName=None, initials=None, bio=None): + resp = requests.put("https://trello.com/1/members/%s" % (idMember_or_username), params=dict(key=self._apikey, token=self._token), data=dict(fullName=fullName, initials=initials, bio=bio)) resp.raise_for_status() return json.loads(resp.content) - def update_bio(self, member_id_or_username, value): - resp = requests.put("https://trello.com/1/members/%s/bio" % (member_id_or_username), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) + def update_bio(self, idMember_or_username, value): + resp = requests.put("https://trello.com/1/members/%s/bio" % (idMember_or_username), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) resp.raise_for_status() return json.loads(resp.content) - def update_fullName(self, member_id_or_username, value): - resp = requests.put("https://trello.com/1/members/%s/fullName" % (member_id_or_username), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) + def update_fullName(self, idMember_or_username, value): + resp = requests.put("https://trello.com/1/members/%s/fullName" % (idMember_or_username), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) resp.raise_for_status() return json.loads(resp.content) - def update_initial(self, member_id_or_username, value): - resp = requests.put("https://trello.com/1/members/%s/initials" % (member_id_or_username), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) + def update_initial(self, idMember_or_username, value): + resp = requests.put("https://trello.com/1/members/%s/initials" % (idMember_or_username), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) resp.raise_for_status() return json.loads(resp.content) diff --git a/trello/notifications.py b/trello/notifications.py --- a/trello/notifications.py +++ b/trello/notifications.py @@ -8,73 +8,83 @@ self._apikey = apikey self._token = token - def get(self, notification_id, fields=None, memberCreator=None, memberCreator_fields=None, board=None, board_fields=None, list=None, card=None, card_fields=None, organization=None, organization_fields=None, member=None, member_fields=None): - resp = requests.get("https://trello.com/1/notifications/%s" % (notification_id), params=dict(key=self._apikey, token=self._token, fields=fields, memberCreator=memberCreator, memberCreator_fields=memberCreator_fields, board=board, board_fields=board_fields, list=list, card=card, card_fields=card_fields, organization=organization, organization_fields=organization_fields, member=member, member_fields=member_fields), data=None) + def get(self, idNotification, fields=None, memberCreator=None, memberCreator_fields=None, board=None, board_fields=None, list=None, card=None, card_fields=None, organization=None, organization_fields=None, member=None, member_fields=None): + resp = requests.get("https://trello.com/1/notifications/%s" % (idNotification), params=dict(key=self._apikey, token=self._token, fields=fields, memberCreator=memberCreator, memberCreator_fields=memberCreator_fields, board=board, board_fields=board_fields, list=list, card=card, card_fields=card_fields, organization=organization, organization_fields=organization_fields, member=member, member_fields=member_fields), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_field(self, field, notification_id): - resp = requests.get("https://trello.com/1/notifications/%s/%s" % (notification_id, field), params=dict(key=self._apikey, token=self._token), data=None) + def get_field(self, field, idNotification): + resp = requests.get("https://trello.com/1/notifications/%s/%s" % (idNotification, field), params=dict(key=self._apikey, token=self._token), data=None) + resp.raise_for_status() + return json.loads(resp.content) + + def get_board(self, idNotification, fields=None): + resp = requests.get("https://trello.com/1/notifications/%s/board" % (idNotification), params=dict(key=self._apikey, token=self._token, fields=fields), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_board(self, notification_id, fields=None): - resp = requests.get("https://trello.com/1/notifications/%s/board" % (notification_id), params=dict(key=self._apikey, token=self._token, fields=fields), data=None) + def get_board_field(self, field, idNotification): + resp = requests.get("https://trello.com/1/notifications/%s/board/%s" % (idNotification, field), params=dict(key=self._apikey, token=self._token), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_board_field(self, field, notification_id): - resp = requests.get("https://trello.com/1/notifications/%s/board/%s" % (notification_id, field), params=dict(key=self._apikey, token=self._token), data=None) + def get_card(self, idNotification, fields=None): + resp = requests.get("https://trello.com/1/notifications/%s/card" % (idNotification), params=dict(key=self._apikey, token=self._token, fields=fields), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_card(self, notification_id, fields=None): - resp = requests.get("https://trello.com/1/notifications/%s/card" % (notification_id), params=dict(key=self._apikey, token=self._token, fields=fields), data=None) + def get_card_field(self, field, idNotification): + resp = requests.get("https://trello.com/1/notifications/%s/card/%s" % (idNotification, field), params=dict(key=self._apikey, token=self._token), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_card_field(self, field, notification_id): - resp = requests.get("https://trello.com/1/notifications/%s/card/%s" % (notification_id, field), params=dict(key=self._apikey, token=self._token), data=None) + def get_list(self, idNotification, fields=None): + resp = requests.get("https://trello.com/1/notifications/%s/list" % (idNotification), params=dict(key=self._apikey, token=self._token, fields=fields), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_list(self, notification_id, fields=None): - resp = requests.get("https://trello.com/1/notifications/%s/list" % (notification_id), params=dict(key=self._apikey, token=self._token, fields=fields), data=None) + def get_list_field(self, field, idNotification): + resp = requests.get("https://trello.com/1/notifications/%s/list/%s" % (idNotification, field), params=dict(key=self._apikey, token=self._token), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_list_field(self, field, notification_id): - resp = requests.get("https://trello.com/1/notifications/%s/list/%s" % (notification_id, field), params=dict(key=self._apikey, token=self._token), data=None) + def get_member(self, idNotification, fields=None): + resp = requests.get("https://trello.com/1/notifications/%s/member" % (idNotification), params=dict(key=self._apikey, token=self._token, fields=fields), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_member(self, notification_id, fields=None): - resp = requests.get("https://trello.com/1/notifications/%s/member" % (notification_id), params=dict(key=self._apikey, token=self._token, fields=fields), data=None) + def get_member_field(self, field, idNotification): + resp = requests.get("https://trello.com/1/notifications/%s/member/%s" % (idNotification, field), params=dict(key=self._apikey, token=self._token), data=None) + resp.raise_for_status() + return json.loads(resp.content) + + def get_memberCreator(self, idNotification, fields=None): + resp = requests.get("https://trello.com/1/notifications/%s/memberCreator" % (idNotification), params=dict(key=self._apikey, token=self._token, fields=fields), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_member_field(self, field, notification_id): - resp = requests.get("https://trello.com/1/notifications/%s/member/%s" % (notification_id, field), params=dict(key=self._apikey, token=self._token), data=None) + def get_memberCreator_field(self, field, idNotification): + resp = requests.get("https://trello.com/1/notifications/%s/memberCreator/%s" % (idNotification, field), params=dict(key=self._apikey, token=self._token), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_memberCreator(self, notification_id, fields=None): - resp = requests.get("https://trello.com/1/notifications/%s/memberCreator" % (notification_id), params=dict(key=self._apikey, token=self._token, fields=fields), data=None) + def get_organization(self, idNotification, fields=None): + resp = requests.get("https://trello.com/1/notifications/%s/organization" % (idNotification), params=dict(key=self._apikey, token=self._token, fields=fields), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_memberCreator_field(self, field, notification_id): - resp = requests.get("https://trello.com/1/notifications/%s/memberCreator/%s" % (notification_id, field), params=dict(key=self._apikey, token=self._token), data=None) + def get_organization_field(self, field, idNotification): + resp = requests.get("https://trello.com/1/notifications/%s/organization/%s" % (idNotification, field), params=dict(key=self._apikey, token=self._token), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_organization(self, notification_id, fields=None): - resp = requests.get("https://trello.com/1/notifications/%s/organization" % (notification_id), params=dict(key=self._apikey, token=self._token, fields=fields), data=None) + def update(self, idNotification, unread=None): + resp = requests.put("https://trello.com/1/notifications/%s" % (idNotification), params=dict(key=self._apikey, token=self._token), data=dict(unread=unread)) resp.raise_for_status() return json.loads(resp.content) - def get_organization_field(self, field, notification_id): - resp = requests.get("https://trello.com/1/notifications/%s/organization/%s" % (notification_id, field), params=dict(key=self._apikey, token=self._token), data=None) + def update_unread(self, idNotification, value): + resp = requests.put("https://trello.com/1/notifications/%s/unread" % (idNotification), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) resp.raise_for_status() return json.loads(resp.content) diff --git a/trello/organizations.py b/trello/organizations.py --- a/trello/organizations.py +++ b/trello/organizations.py @@ -8,63 +8,68 @@ self._apikey = apikey self._token = token - def get(self, org_id_or_name, actions=None, action_fields=None, action_limit=None, members=None, member_fields=None, boards=None, board_fields=None, fields=None): - resp = requests.get("https://trello.com/1/organizations/%s" % (org_id_or_name), params=dict(key=self._apikey, token=self._token, actions=actions, action_fields=action_fields, action_limit=action_limit, members=members, member_fields=member_fields, boards=boards, board_fields=board_fields, fields=fields), data=None) + def get(self, idOrg_or_name, actions=None, actions_limit=None, action_fields=None, members=None, member_fields=None, boards=None, board_fields=None, board_actions=None, board_actions_format=None, board_actions_since=None, board_actions_limit=None, board_action_fields=None, fields=None): + resp = requests.get("https://trello.com/1/organizations/%s" % (idOrg_or_name), params=dict(key=self._apikey, token=self._token, actions=actions, actions_limit=actions_limit, action_fields=action_fields, members=members, member_fields=member_fields, boards=boards, board_fields=board_fields, board_actions=board_actions, board_actions_format=board_actions_format, board_actions_since=board_actions_since, board_actions_limit=board_actions_limit, board_action_fields=board_action_fields, fields=fields), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_field(self, field, org_id_or_name): - resp = requests.get("https://trello.com/1/organizations/%s/%s" % (org_id_or_name, field), params=dict(key=self._apikey, token=self._token), data=None) + def get_field(self, field, idOrg_or_name): + resp = requests.get("https://trello.com/1/organizations/%s/%s" % (idOrg_or_name, field), params=dict(key=self._apikey, token=self._token), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_action(self, org_id_or_name, filter=None, fields=None, limit=None, page=None, idModels=None): - resp = requests.get("https://trello.com/1/organizations/%s/actions" % (org_id_or_name), params=dict(key=self._apikey, token=self._token, filter=filter, fields=fields, limit=limit, page=page, idModels=idModels), data=None) + def get_action(self, idOrg_or_name, filter=None, fields=None, limit=None, format=None, since=None, page=None, idModels=None): + resp = requests.get("https://trello.com/1/organizations/%s/actions" % (idOrg_or_name), params=dict(key=self._apikey, token=self._token, filter=filter, fields=fields, limit=limit, format=format, since=since, page=page, idModels=idModels), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_board(self, org_id_or_name, filter=None, fields=None, actions=None, action_fields=None, action_limit=None): - resp = requests.get("https://trello.com/1/organizations/%s/boards" % (org_id_or_name), params=dict(key=self._apikey, token=self._token, filter=filter, fields=fields, actions=actions, action_fields=action_fields, action_limit=action_limit), data=None) + def get_board(self, idOrg_or_name, filter=None, fields=None, actions=None, actions_limit=None, actions_format=None, actions_since=None, action_fields=None, lists=None): + resp = requests.get("https://trello.com/1/organizations/%s/boards" % (idOrg_or_name), params=dict(key=self._apikey, token=self._token, filter=filter, fields=fields, actions=actions, actions_limit=actions_limit, actions_format=actions_format, actions_since=actions_since, action_fields=action_fields, lists=lists), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_board_filter(self, filter, org_id_or_name): - resp = requests.get("https://trello.com/1/organizations/%s/boards/%s" % (org_id_or_name, filter), params=dict(key=self._apikey, token=self._token), data=None) + def get_board_filter(self, filter, idOrg_or_name): + resp = requests.get("https://trello.com/1/organizations/%s/boards/%s" % (idOrg_or_name, filter), params=dict(key=self._apikey, token=self._token), data=None) + resp.raise_for_status() + return json.loads(resp.content) + + def get_member(self, idOrg_or_name, filter=None, fields=None): + resp = requests.get("https://trello.com/1/organizations/%s/members" % (idOrg_or_name), params=dict(key=self._apikey, token=self._token, filter=filter, fields=fields), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_member(self, org_id_or_name, filter=None, fields=None): - resp = requests.get("https://trello.com/1/organizations/%s/members" % (org_id_or_name), params=dict(key=self._apikey, token=self._token, filter=filter, fields=fields), data=None) + def get_member_filter(self, filter, idOrg_or_name): + resp = requests.get("https://trello.com/1/organizations/%s/members/%s" % (idOrg_or_name, filter), params=dict(key=self._apikey, token=self._token), data=None) resp.raise_for_status() return json.loads(resp.content) - def get_member_filter(self, filter, org_id_or_name): - resp = requests.get("https://trello.com/1/organizations/%s/members/%s" % (org_id_or_name, filter), params=dict(key=self._apikey, token=self._token), data=None) + def update(self, idOrg_or_name, name=None, displayName=None, desc=None, website=None, prefs/permissionLevel=None): + resp = requests.put("https://trello.com/1/organizations/%s" % (idOrg_or_name), params=dict(key=self._apikey, token=self._token), data=dict(name=name, displayName=displayName, desc=desc, website=website, prefs/permissionLevel=prefs/permissionLevel)) resp.raise_for_status() return json.loads(resp.content) - def update(self, org_id_or_name, name=None, displayName=None, desc=None, website=None): - resp = requests.put("https://trello.com/1/organizations/%s" % (org_id_or_name), params=dict(key=self._apikey, token=self._token), data=dict(name=name, displayName=displayName, desc=desc, website=website)) + def update_desc(self, idOrg_or_name, value): + resp = requests.put("https://trello.com/1/organizations/%s/desc" % (idOrg_or_name), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) resp.raise_for_status() return json.loads(resp.content) - def update_desc(self, org_id_or_name, value): - resp = requests.put("https://trello.com/1/organizations/%s/desc" % (org_id_or_name), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) + def update_displayName(self, idOrg_or_name, value): + resp = requests.put("https://trello.com/1/organizations/%s/displayName" % (idOrg_or_name), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) resp.raise_for_status() return json.loads(resp.content) - def update_displayName(self, org_id_or_name, value): - resp = requests.put("https://trello.com/1/organizations/%s/displayName" % (org_id_or_name), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) + def update_name(self, idOrg_or_name, value): + resp = requests.put("https://trello.com/1/organizations/%s/name" % (idOrg_or_name), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) resp.raise_for_status() return json.loads(resp.content) - def update_name(self, org_id_or_name, value): - resp = requests.put("https://trello.com/1/organizations/%s/name" % (org_id_or_name), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) + def update_pref_permissionLevel(self, idOrg_or_name, value): + resp = requests.put("https://trello.com/1/organizations/%s/prefs/permissionLevel" % (idOrg_or_name), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) resp.raise_for_status() return json.loads(resp.content) - def update_website(self, org_id_or_name, value): - resp = requests.put("https://trello.com/1/organizations/%s/website" % (org_id_or_name), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) + def update_website(self, idOrg_or_name, value): + resp = requests.put("https://trello.com/1/organizations/%s/website" % (idOrg_or_name), params=dict(key=self._apikey, token=self._token), data=dict(value=value)) resp.raise_for_status() return json.loads(resp.content) @@ -73,8 +78,13 @@ resp.raise_for_status() return json.loads(resp.content) - def delete(self, org_id_or_name): - resp = requests.delete("https://trello.com/1/organizations/%s" % (org_id_or_name), params=dict(key=self._apikey, token=self._token), data=None) + def delete(self, idOrg_or_name): + resp = requests.delete("https://trello.com/1/organizations/%s" % (idOrg_or_name), params=dict(key=self._apikey, token=self._token), data=None) + resp.raise_for_status() + return json.loads(resp.content) + + def delete_member_idMember(self, idMember, idOrg_or_name): + resp = requests.delete("https://trello.com/1/organizations/%s/members/%s" % (idOrg_or_name, idMember), params=dict(key=self._apikey, token=self._token), data=None) resp.raise_for_status() return json.loads(resp.content) diff --git a/trello/searchs.py b/trello/searchs.py new file mode 100644 --- /dev/null +++ b/trello/searchs.py @@ -0,0 +1,16 @@ +import json +import requests + +class Searchs(object): + __module__ = 'trello' + + def __init__(self, apikey, token=None): + self._apikey = apikey + self._token = token + + def get(self, query, idOrganizations, idBoards=None, idCards=None, modelTypes=None, board_fields=None, boards_limit=None, card_fields=None, cards_limit=None, card_board=None, card_list=None, card_members=None, organization_fields=None, organizations_limit=None, member_fields=None, members_limit=None, action_fields=None, actions_limit=None, actions_since=None, partial=None): + resp = requests.get("https://trello.com/1/search" % (), params=dict(key=self._apikey, token=self._token, query=query, idOrganizations=idOrganizations, idBoards=idBoards, idCards=idCards, modelTypes=modelTypes, board_fields=board_fields, boards_limit=boards_limit, card_fields=card_fields, cards_limit=cards_limit, card_board=card_board, card_list=card_list, card_members=card_members, organization_fields=organization_fields, organizations_limit=organizations_limit, member_fields=member_fields, members_limit=members_limit, action_fields=action_fields, actions_limit=actions_limit, actions_since=actions_since, partial=partial), data=None) + resp.raise_for_status() + return json.loads(resp.content) + + diff --git a/trello/tokens.py b/trello/tokens.py --- a/trello/tokens.py +++ b/trello/tokens.py @@ -28,4 +28,9 @@ resp.raise_for_status() return json.loads(resp.content) + def delete(self, token): + resp = requests.delete("https://trello.com/1/tokens/%s" % (token), params=dict(key=self._apikey, token=self._token), data=None) + resp.raise_for_status() + return json.loads(resp.content) +