From c7028ed6eb468c9ed668252c25b01513333bc236 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: May 28 2015 12:34:15 +0000 Subject: Drop the use of the httpcode since we use exceptions for errors --- diff --git a/pagure/api/fork.py b/pagure/api/fork.py index 287aea8..0bdc0d4 100644 --- a/pagure/api/fork.py +++ b/pagure/api/fork.py @@ -116,7 +116,6 @@ def api_pull_request_views(repo, username=None): """ repo = pagure.lib.get_project(SESSION, repo, user=username) - httpcode = 200 output = {} if repo is None: @@ -152,7 +151,6 @@ def api_pull_request_views(repo, username=None): 'assignee': assignee, 'author': author, }) - jsonout.status_code = httpcode return jsonout @@ -237,7 +235,6 @@ def api_pull_request_view(repo, requestid, username=None): """ repo = pagure.lib.get_project(SESSION, repo, user=username) - httpcode = 200 output = {} if repo is None: @@ -254,7 +251,6 @@ def api_pull_request_view(repo, requestid, username=None): raise pagure.exceptions.APIError(404, error_code=APIERROR.ENOREQ) jsonout = flask.jsonify(request.to_json(public=True)) - jsonout.status_code = httpcode return jsonout @@ -286,7 +282,6 @@ def api_pull_request_merge(repo, requestid, username=None): } """ - httpcode = 200 output = {} repo = pagure.lib.get_project(SESSION, repo, user=username) @@ -333,7 +328,6 @@ def api_pull_request_merge(repo, requestid, username=None): 400, error_code=APIERROR.ENOCODE, error=str(err)) jsonout = flask.jsonify(output) - jsonout.status_code = httpcode return jsonout @@ -366,7 +360,6 @@ def api_pull_request_close(repo, requestid, username=None): } """ - httpcode = 200 output = {} repo = pagure.lib.get_project(SESSION, repo, user=username) @@ -403,7 +396,6 @@ def api_pull_request_close(repo, requestid, username=None): raise pagure.exceptions.APIError(400, error_code=APIERROR.EDBERROR) jsonout = flask.jsonify(output) - jsonout.status_code = httpcode return jsonout @@ -443,7 +435,6 @@ def api_pull_request_add_comment(repo, requestid, username=None): """ repo = pagure.lib.get_project(SESSION, repo, user=username) - httpcode = 200 output = {} if repo is None: @@ -490,5 +481,4 @@ def api_pull_request_add_comment(repo, requestid, username=None): raise pagure.exceptions.APIError(400, error_code=APIERROR.EINVALIDREQ) jsonout = flask.jsonify(output) - jsonout.status_code = httpcode return jsonout diff --git a/pagure/api/issue.py b/pagure/api/issue.py index 09f8c60..e224560 100644 --- a/pagure/api/issue.py +++ b/pagure/api/issue.py @@ -54,7 +54,6 @@ def api_new_issue(repo, username=None): """ repo = pagure.lib.get_project(SESSION, repo, user=username) - httpcode = 200 output = {} if repo is None: @@ -120,7 +119,6 @@ def api_new_issue(repo, username=None): raise pagure.exceptions.APIError(400, error_code=APIERROR.EINVALIDREQ) jsonout = flask.jsonify(output) - jsonout.status_code = httpcode return jsonout @@ -247,7 +245,6 @@ def api_view_issues(repo, username=None): """ repo = pagure.lib.get_project(SESSION, repo, user=username) - httpcode = 200 output = {} if repo is None: @@ -305,7 +302,6 @@ def api_view_issues(repo, username=None): 'assignee': assignee, 'author': author, }) - jsonout.status_code = httpcode return jsonout @@ -354,7 +350,6 @@ def api_view_issue(repo, issueid, username=None): """ repo = pagure.lib.get_project(SESSION, repo, user=username) - httpcode = 200 output = {} if repo is None: @@ -375,7 +370,6 @@ def api_view_issue(repo, issueid, username=None): raise pagure.exceptions.APIError(403, error_code=APIERROR.EISSUEREST) jsonout = flask.jsonify(issue.to_json(public=True)) - jsonout.status_code = httpcode return jsonout @@ -409,7 +403,6 @@ def api_change_status_issue(repo, issueid, username=None): """ repo = pagure.lib.get_project(SESSION, repo, user=username) - httpcode = 200 output = {} if repo is None: @@ -461,7 +454,6 @@ def api_change_status_issue(repo, issueid, username=None): raise pagure.exceptions.APIError(400, error_code=APIERROR.EINVALIDREQ) jsonout = flask.jsonify(output) - jsonout.status_code = httpcode return jsonout @@ -495,7 +487,6 @@ def api_comment_issue(repo, issueid, username=None): """ repo = pagure.lib.get_project(SESSION, repo, user=username) - httpcode = 200 output = {} if repo is None: @@ -540,5 +531,4 @@ def api_comment_issue(repo, issueid, username=None): raise pagure.exceptions.APIError(400, error_code=APIERROR.EINVALIDREQ) jsonout = flask.jsonify(output) - jsonout.status_code = httpcode return jsonout