diff --git a/pagure/api/issue.py b/pagure/api/issue.py index f09b2a5..648cbf3 100644 --- a/pagure/api/issue.py +++ b/pagure/api/issue.py @@ -871,7 +871,7 @@ def api_change_status_issue(repo, issueid, username=None, namespace=None): raise pagure.exceptions.APIError( 400, error_code=APIERROR.ENOCODE, error=str(err) ) - except SQLAlchemyError as err: # pragma: no cover + except SQLAlchemyError: # pragma: no cover flask.g.session.rollback() raise pagure.exceptions.APIError(400, error_code=APIERROR.EDBERROR) @@ -976,7 +976,7 @@ def api_change_milestone_issue(repo, issueid, username=None, namespace=None): raise pagure.exceptions.APIError( 400, error_code=APIERROR.ENOCODE, error=str(err) ) - except SQLAlchemyError as err: # pragma: no cover + except SQLAlchemyError: # pragma: no cover flask.g.session.rollback() raise pagure.exceptions.APIError(400, error_code=APIERROR.EDBERROR) diff --git a/pagure/api/project.py b/pagure/api/project.py index 50d9625..c90ad91 100644 --- a/pagure/api/project.py +++ b/pagure/api/project.py @@ -1637,7 +1637,7 @@ def api_update_project_watchers(repo, username=None, namespace=None): try: pagure.lib.get_user(flask.g.session, watcher) - except pagure.exceptions.PagureException as err: + except pagure.exceptions.PagureException: _log.debug( "api_update_project_watchers: Invalid user watching: %s", watcher ) @@ -1859,7 +1859,7 @@ def api_modify_acls(repo, namespace=None, username=None): project.fullname, ) try: - msg = pagure.lib.remove_user_of_project( + pagure.lib.remove_user_of_project( flask.g.session, user_obj, project, diff --git a/pagure/lib/git.py b/pagure/lib/git.py index 3fa18aa..3d0e108 100644 --- a/pagure/lib/git.py +++ b/pagure/lib/git.py @@ -1590,7 +1590,7 @@ def merge_pull_request(session, request, username, domerge=True): pagure.lib.close_pull_request(session, request, username) try: session.commit() - except SQLAlchemyError as err: # pragma: no cover + except SQLAlchemyError: # pragma: no cover session.rollback() _log.exception(" Could not merge the PR in the DB") raise pagure.exceptions.PagureException( diff --git a/pagure/lib/tasks_services.py b/pagure/lib/tasks_services.py index 1fed13e..33af2b0 100644 --- a/pagure/lib/tasks_services.py +++ b/pagure/lib/tasks_services.py @@ -382,9 +382,9 @@ def load_json_commits_to_db( "Issue import report", user_obj.default_email, ) - except pagure.exceptions.PagureException as err: + except pagure.exceptions.PagureException: _log.exception("LOADJSON: Could not find user %s" % agent) - except SQLAlchemyError as err: # pragma: no cover + except SQLAlchemyError: # pragma: no cover session.rollback() _log.info("LOADJSON: Ready for another") diff --git a/pagure/ui/groups.py b/pagure/ui/groups.py index 1b27575..e007bbd 100644 --- a/pagure/ui/groups.py +++ b/pagure/ui/groups.py @@ -99,7 +99,7 @@ def view_group(group): return flask.redirect( flask.url_for("ui_ns.view_group", group=group.group_name) ) - except SQLAlchemyError as err: # pragma: no cover + except SQLAlchemyError: # pragma: no cover flask.g.session.rollback() flask.flash( "Could not add user `%s` to group `%s`." @@ -165,7 +165,7 @@ def edit_group(group): return flask.redirect( flask.url_for("ui_ns.view_group", group=group.group_name) ) - except SQLAlchemyError as err: # pragma: no cover + except SQLAlchemyError: # pragma: no cover flask.g.session.rollback() flask.flash( "Could not edit group `%s`." % (group.group_name), "error" @@ -211,7 +211,7 @@ def group_user_delete(user, group): return flask.redirect( flask.url_for("ui_ns.view_group", group=group) ) - except SQLAlchemyError as err: # pragma: no cover + except SQLAlchemyError: # pragma: no cover flask.g.session.rollback() flask.flash( "Could not remove user `%s` from the group `%s`." @@ -323,7 +323,7 @@ def add_group(): except pagure.exceptions.PagureException as err: flask.g.session.rollback() flask.flash("%s" % err, "error") - except SQLAlchemyError as err: # pragma: no cover + except SQLAlchemyError: # pragma: no cover flask.g.session.rollback() flask.flash("Could not create group.") _log.exception("Could not create group.") diff --git a/pagure/ui/plugins.py b/pagure/ui/plugins.py index ab6518c..1c7b2d3 100644 --- a/pagure/ui/plugins.py +++ b/pagure/ui/plugins.py @@ -125,7 +125,7 @@ def view_plugin(repo, plugin, username=None, namespace=None, full=True): flask.g.session.add(dbobj) try: flask.g.session.flush() - except SQLAlchemyError as err: # pragma: no cover + except SQLAlchemyError: # pragma: no cover flask.g.session.rollback() _log.exception("Could not add plugin %s", plugin.name) message = Markup(