From bfa8700fef975e0e7081c25c3ea224e5f1165ae6 Mon Sep 17 00:00:00 2001 From: Jakub Kadlcik Date: Sep 13 2021 10:18:37 +0000 Subject: frontend: drop LegacyApiError exception --- diff --git a/frontend/coprs_frontend/coprs/exceptions.py b/frontend/coprs_frontend/coprs/exceptions.py index 84367dd..5239f96 100644 --- a/frontend/coprs_frontend/coprs/exceptions.py +++ b/frontend/coprs_frontend/coprs/exceptions.py @@ -45,12 +45,6 @@ class ApiError(CoprHttpException): _code = 500 -class LegacyApiError(CoprHttpException): - - _default = "API error" - _code = 500 - - class InsufficientStorage(CoprHttpException): """When there is not enough space left on the server for the src rpm.""" _default = "Not enough space left" diff --git a/frontend/coprs_frontend/coprs/views/apiv3_ns/apiv3_packages.py b/frontend/coprs_frontend/coprs/views/apiv3_ns/apiv3_packages.py index f40660e..ea2e316 100644 --- a/frontend/coprs_frontend/coprs/views/apiv3_ns/apiv3_packages.py +++ b/frontend/coprs_frontend/coprs/views/apiv3_ns/apiv3_packages.py @@ -6,7 +6,7 @@ from coprs.exceptions import ( NoPackageSourceException, InsufficientRightsException, DuplicateException, - LegacyApiError, + ApiError, UnknownSourceTypeException, ) from coprs.views.misc import api_login_required @@ -211,16 +211,16 @@ def process_package_add_or_edit(copr, source_type_text, package=None, data=None) add_function(key, value) form = forms.get_package_form_cls_by_source_type_text(source_type_text)(formdata, meta={'csrf': False}) except UnknownSourceTypeException: - raise LegacyApiError("Unsupported package source type {source_type_text}".format(source_type_text=source_type_text)) + raise ApiError("Unsupported package source type {source_type_text}".format(source_type_text=source_type_text)) if form.validate_on_submit(): if not package: try: package = PackagesLogic.add(flask.app.g.user, copr.main_dir, form.package_name.data) except InsufficientRightsException: - raise LegacyApiError("Insufficient permissions.") + raise ApiError("Insufficient permissions.") except DuplicateException: - raise LegacyApiError("Package {0} already exists in copr {1}.".format(form.package_name.data, copr.full_name)) + raise ApiError("Package {0} already exists in copr {1}.".format(form.package_name.data, copr.full_name)) try: source_type = helpers.BuildSourceEnum(source_type_text) @@ -237,7 +237,7 @@ def process_package_add_or_edit(copr, source_type_text, package=None, data=None) db.session.add(package) db.session.commit() else: - raise LegacyApiError(form.errors) + raise ApiError(form.errors) return flask.jsonify({ "output": "ok",