diff --git a/rhodecode/controllers/admin/repo_groups.py b/rhodecode/controllers/admin/repo_groups.py --- a/rhodecode/controllers/admin/repo_groups.py +++ b/rhodecode/controllers/admin/repo_groups.py @@ -39,12 +39,12 @@ from rhodecode.lib.auth import ( LoginRequired, NotAnonymous, HasPermissionAll, HasRepoGroupPermissionAll, HasRepoGroupPermissionAnyDecorator) from rhodecode.lib.base import BaseController, render +from rhodecode.lib.utils2 import safe_int from rhodecode.model.db import RepoGroup, User from rhodecode.model.scm import RepoGroupList from rhodecode.model.repo_group import RepoGroupModel from rhodecode.model.forms import RepoGroupForm, RepoGroupPermsForm from rhodecode.model.meta import Session -from rhodecode.lib.utils2 import safe_int log = logging.getLogger(__name__) diff --git a/rhodecode/controllers/admin/repos.py b/rhodecode/controllers/admin/repos.py --- a/rhodecode/controllers/admin/repos.py +++ b/rhodecode/controllers/admin/repos.py @@ -41,15 +41,11 @@ from rhodecode.lib.auth import ( HasRepoGroupPermissionAny, HasRepoPermissionAnyDecorator) from rhodecode.lib.base import BaseRepoController, render from rhodecode.lib.ext_json import json -from rhodecode.lib.exceptions import AttachedForksError -from rhodecode.lib.utils import action_logger, repo_name_slug, jsonify +from rhodecode.lib.utils import repo_name_slug, jsonify from rhodecode.lib.utils2 import safe_int, str2bool -from rhodecode.lib.vcs import RepositoryError -from rhodecode.model.db import ( - User, Repository, UserFollowing, RepoGroup, RepositoryField) +from rhodecode.model.db import (Repository, RepoGroup, RepositoryField) from rhodecode.model.forms import ( - RepoForm, RepoFieldForm, RepoPermsForm, RepoVcsSettingsForm, - IssueTrackerPatternsForm) + RepoForm, RepoFieldForm, RepoVcsSettingsForm, IssueTrackerPatternsForm) from rhodecode.model.meta import Session from rhodecode.model.repo import RepoModel from rhodecode.model.scm import ScmModel, RepoGroupList, RepoList diff --git a/rhodecode/controllers/admin/user_groups.py b/rhodecode/controllers/admin/user_groups.py --- a/rhodecode/controllers/admin/user_groups.py +++ b/rhodecode/controllers/admin/user_groups.py @@ -35,6 +35,7 @@ from sqlalchemy.orm import joinedload from rhodecode.lib import auth from rhodecode.lib import helpers as h +from rhodecode.lib.ext_json import json from rhodecode.lib.exceptions import UserGroupAssignedException,\ RepoGroupAssignmentError from rhodecode.lib.utils import jsonify, action_logger @@ -52,8 +53,7 @@ from rhodecode.model.forms import ( UserGroupForm, UserGroupPermsForm, UserIndividualPermissionsForm, UserPermissionsForm) from rhodecode.model.meta import Session -from rhodecode.lib.utils import action_logger -from rhodecode.lib.ext_json import json + log = logging.getLogger(__name__) diff --git a/rhodecode/controllers/changeset.py b/rhodecode/controllers/changeset.py --- a/rhodecode/controllers/changeset.py +++ b/rhodecode/controllers/changeset.py @@ -39,7 +39,7 @@ from rhodecode.lib.base import BaseRepoC from rhodecode.lib.compat import OrderedDict from rhodecode.lib.exceptions import StatusChangeOnClosedPullRequestError import rhodecode.lib.helpers as h -from rhodecode.lib.utils import action_logger, jsonify +from rhodecode.lib.utils import jsonify from rhodecode.lib.utils2 import safe_unicode from rhodecode.lib.vcs.backends.base import EmptyCommit from rhodecode.lib.vcs.exceptions import ( @@ -48,7 +48,6 @@ from rhodecode.model.db import Changeset from rhodecode.model.changeset_status import ChangesetStatusModel from rhodecode.model.comment import CommentsModel from rhodecode.model.meta import Session -from rhodecode.model.repo import RepoModel log = logging.getLogger(__name__)