Fix a merge conflict resolving mistake

This commit is contained in:
Sijmen 2019-09-13 14:40:32 +02:00
parent e0f95d0d6b
commit d2c855922b
1 changed files with 4 additions and 2 deletions

View File

@ -5,7 +5,7 @@ from . import _BASE_URL, _headers, _with_token
@_with_token @_with_token
def get(token: str, story_id: int = None) -> Dict[str, Any]: def get(story_id: int = None, token: str = None) -> Dict[str, Any]:
r = requests.get(f"{_BASE_URL}/stories/{story_id}", headers=_headers(token)) r = requests.get(f"{_BASE_URL}/stories/{story_id}", headers=_headers(token))
return r.json() return r.json()
@ -36,6 +36,8 @@ def get_comments(project_id: int, story_id: int, token: str) -> List[Dict[str, A
def get_blockers(project_id: int, story_id: int, token: str) -> List[Dict[str, Any]]: def get_blockers(project_id: int, story_id: int, token: str) -> List[Dict[str, Any]]:
url = f"{_BASE_URL}/projects/{project_id}/stories/{story_id}/blockers" url = f"{_BASE_URL}/projects/{project_id}/stories/{story_id}/blockers"
r = requests.get(url, headers=_headers(token)) r = requests.get(url, headers=_headers(token))
r.raise_for_status()
return r.json()
@_with_token @_with_token
@ -51,7 +53,7 @@ def post(project_id: int, token: str, **kwargs: Any) -> Dict[str, Any]:
@_with_token @_with_token
def post_blocker( def post_blocker(
token: str, project_id: int, story_id: int, token: str, **kwargs project_id: int, story_id: int, token: str, **kwargs
) -> Dict[str, Any]: ) -> Dict[str, Any]:
r = requests.post( r = requests.post(
f"{_BASE_URL}/projects/{project_id}/stories/{story_id}/blockers", f"{_BASE_URL}/projects/{project_id}/stories/{story_id}/blockers",