diff --git a/kallithea/controllers/changeset.py b/kallithea/controllers/changeset.py --- a/kallithea/controllers/changeset.py +++ b/kallithea/controllers/changeset.py @@ -27,30 +27,28 @@ Original author and date, and relevant c import logging import traceback -from collections import defaultdict +from collections import OrderedDict, defaultdict -from tg import tmpl_context as c, request, response +from tg import request, response +from tg import tmpl_context as c from tg.i18n import ugettext as _ -from webob.exc import HTTPFound, HTTPForbidden, HTTPBadRequest, HTTPNotFound - -from kallithea.lib.vcs.exceptions import RepositoryError, \ - ChangesetDoesNotExistError, EmptyRepositoryError +from webob.exc import HTTPBadRequest, HTTPForbidden, HTTPFound, HTTPNotFound import kallithea.lib.helpers as h -from kallithea.lib.auth import LoginRequired, HasRepoPermissionLevelDecorator -from kallithea.lib.base import BaseRepoController, render, jsonify +from kallithea.lib import diffs +from kallithea.lib.auth import HasRepoPermissionLevelDecorator, LoginRequired +from kallithea.lib.base import BaseRepoController, jsonify, render +from kallithea.lib.graphmod import graph_data from kallithea.lib.utils import action_logger -from kallithea.lib.compat import OrderedDict -from kallithea.lib import diffs +from kallithea.lib.utils2 import safe_unicode +from kallithea.lib.vcs.backends.base import EmptyChangeset +from kallithea.lib.vcs.exceptions import ChangesetDoesNotExistError, EmptyRepositoryError, RepositoryError +from kallithea.model.changeset_status import ChangesetStatusModel +from kallithea.model.comment import ChangesetCommentsModel from kallithea.model.db import ChangesetComment, ChangesetStatus -from kallithea.model.comment import ChangesetCommentsModel -from kallithea.model.changeset_status import ChangesetStatusModel from kallithea.model.meta import Session from kallithea.model.pull_request import PullRequestModel -from kallithea.model.repo import RepoModel -from kallithea.lib.vcs.backends.base import EmptyChangeset -from kallithea.lib.utils2 import safe_unicode -from kallithea.lib.graphmod import graph_data + log = logging.getLogger(__name__) @@ -208,7 +206,7 @@ def create_cs_pr_comment(repo_name, revi h.HasPermissionAny('hg.admin')() or h.HasRepoPermissionLevel('admin')(pull_request.org_repo.repo_name) or h.HasRepoPermissionLevel('admin')(pull_request.other_repo.repo_name) - ) and not pull_request.is_closed(): + ) and not pull_request.is_closed(): PullRequestModel().delete(pull_request) Session().commit() h.flash(_('Successfully deleted pull request %s') % pull_request_id,