diff --git a/kallithea/config/environment.py b/kallithea/config/environment.py --- a/kallithea/config/environment.py +++ b/kallithea/config/environment.py @@ -33,7 +33,7 @@ from kallithea.config.routing import mak from kallithea.lib import helpers from kallithea.lib.auth import set_available_permissions -from kallithea.lib.utils import repo2db_mapper, make_ui, set_app_settings,\ +from kallithea.lib.utils import repo2db_mapper, make_ui, set_app_settings, \ load_rcextensions, check_git_version, set_vcs_config, set_indexer_config from kallithea.lib.utils2 import engine_from_config, str2bool from kallithea.lib.db_manage import DbManage diff --git a/kallithea/controllers/admin/admin.py b/kallithea/controllers/admin/admin.py --- a/kallithea/controllers/admin/admin.py +++ b/kallithea/controllers/admin/admin.py @@ -125,8 +125,8 @@ class AdminController(BaseController): @HasPermissionAllDecorator('hg.admin') def index(self): - users_log = UserLog.query()\ - .options(joinedload(UserLog.user))\ + users_log = UserLog.query() \ + .options(joinedload(UserLog.user)) \ .options(joinedload(UserLog.repository)) #FILTERING diff --git a/kallithea/controllers/admin/gists.py b/kallithea/controllers/admin/gists.py --- a/kallithea/controllers/admin/gists.py +++ b/kallithea/controllers/admin/gists.py @@ -73,23 +73,23 @@ class GistsController(BaseController): c.show_private = request.GET.get('private') and not_default_user c.show_public = request.GET.get('public') and not_default_user - gists = Gist().query()\ - .filter(or_(Gist.gist_expires == -1, Gist.gist_expires >= time.time()))\ + gists = Gist().query() \ + .filter(or_(Gist.gist_expires == -1, Gist.gist_expires >= time.time())) \ .order_by(Gist.created_on.desc()) # MY private if c.show_private and not c.show_public: - gists = gists.filter(Gist.gist_type == Gist.GIST_PRIVATE)\ + gists = gists.filter(Gist.gist_type == Gist.GIST_PRIVATE) \ .filter(Gist.gist_owner == c.authuser.user_id) # MY public elif c.show_public and not c.show_private: - gists = gists.filter(Gist.gist_type == Gist.GIST_PUBLIC)\ + gists = gists.filter(Gist.gist_type == Gist.GIST_PUBLIC) \ .filter(Gist.gist_owner == c.authuser.user_id) # MY public+private elif c.show_private and c.show_public: gists = gists.filter(or_(Gist.gist_type == Gist.GIST_PUBLIC, - Gist.gist_type == Gist.GIST_PRIVATE))\ + Gist.gist_type == Gist.GIST_PRIVATE)) \ .filter(Gist.gist_owner == c.authuser.user_id) # default show ALL public gists diff --git a/kallithea/controllers/admin/my_account.py b/kallithea/controllers/admin/my_account.py --- a/kallithea/controllers/admin/my_account.py +++ b/kallithea/controllers/admin/my_account.py @@ -81,9 +81,9 @@ class MyAccountController(BaseController self.authuser.user_id).all()] else: admin = True - repos_list = Session().query(Repository)\ + repos_list = Session().query(Repository) \ .filter(Repository.user_id == - self.authuser.user_id)\ + self.authuser.user_id) \ .order_by(func.lower(Repository.repo_name)).all() repos_data = RepoModel().get_repos_as_dict(repos_list=repos_list, @@ -207,7 +207,7 @@ class MyAccountController(BaseController c.active = 'emails' self.__load_data() - c.user_email_map = UserEmailMap.query()\ + c.user_email_map = UserEmailMap.query() \ .filter(UserEmailMap.user == c.user).all() return render('admin/my_account/my_account.html') diff --git a/kallithea/controllers/admin/notifications.py b/kallithea/controllers/admin/notifications.py --- a/kallithea/controllers/admin/notifications.py +++ b/kallithea/controllers/admin/notifications.py @@ -154,7 +154,7 @@ class NotificationsController(BaseContro for un in no.notifications_to_users) repo_admin = h.HasRepoPermissionAny('repository.admin') if no and (h.HasPermissionAny('hg.admin')() or repo_admin or owner): - unotification = NotificationModel()\ + unotification = NotificationModel() \ .get_user_notification(c.user.user_id, no) # if this association to user is not valid, we don't want to show diff --git a/kallithea/controllers/admin/permissions.py b/kallithea/controllers/admin/permissions.py --- a/kallithea/controllers/admin/permissions.py +++ b/kallithea/controllers/admin/permissions.py @@ -184,7 +184,7 @@ class PermissionsController(BaseControll def permission_ips(self): c.active = 'ips' c.user = User.get_default_user() - c.user_ip_map = UserIpMap.query()\ + c.user_ip_map = UserIpMap.query() \ .filter(UserIpMap.user == c.user).all() return render('admin/permissions/permissions.html') diff --git a/kallithea/controllers/admin/repo_groups.py b/kallithea/controllers/admin/repo_groups.py --- a/kallithea/controllers/admin/repo_groups.py +++ b/kallithea/controllers/admin/repo_groups.py @@ -110,8 +110,8 @@ class RepoGroupsController(BaseControlle def index(self, format='html'): """GET /repo_groups: All items in the collection""" # url('repos_groups') - _list = RepoGroup.query()\ - .order_by(func.lower(RepoGroup.group_name))\ + _list = RepoGroup.query() \ + .order_by(func.lower(RepoGroup.group_name)) \ .all() group_iter = RepoGroupList(_list, perm_set=['group.admin']) repo_groups_data = [] @@ -329,13 +329,13 @@ class RepoGroupsController(BaseControlle #overwrite our cached list with current filter c.repo_cnt = 0 - groups = RepoGroup.query().order_by(RepoGroup.group_name)\ + groups = RepoGroup.query().order_by(RepoGroup.group_name) \ .filter(RepoGroup.group_parent_id == c.group.group_id).all() c.groups = self.scm_model.get_repo_groups(groups) - c.repos_list = Repository.query()\ - .filter(Repository.group_id == c.group.group_id)\ - .order_by(func.lower(Repository.repo_name))\ + c.repos_list = Repository.query() \ + .filter(Repository.group_id == c.group.group_id) \ + .order_by(func.lower(Repository.repo_name)) \ .all() repos_data = RepoModel().get_repos_as_dict(repos_list=c.repos_list, diff --git a/kallithea/controllers/admin/repos.py b/kallithea/controllers/admin/repos.py --- a/kallithea/controllers/admin/repos.py +++ b/kallithea/controllers/admin/repos.py @@ -42,7 +42,7 @@ from kallithea.lib.base import BaseRepoC from kallithea.lib.utils import action_logger, jsonify from kallithea.lib.vcs import RepositoryError from kallithea.model.meta import Session -from kallithea.model.db import User, Repository, UserFollowing, RepoGroup,\ +from kallithea.model.db import User, Repository, UserFollowing, RepoGroup, \ Setting, RepositoryField from kallithea.model.forms import RepoForm, RepoFieldForm, RepoPermsForm from kallithea.model.scm import ScmModel, AvailableRepoGroupChoices, RepoList @@ -102,8 +102,8 @@ class ReposController(BaseRepoController def index(self, format='html'): """GET /repos: All items in the collection""" # url('repos') - _list = Repository.query()\ - .order_by(func.lower(Repository.repo_name))\ + _list = Repository.query() \ + .order_by(func.lower(Repository.repo_name)) \ .all() c.repos_list = RepoList(_list, perm_set=['repository.admin']) @@ -127,7 +127,7 @@ class ReposController(BaseRepoController try: # CanWriteGroup validators checks permissions of this POST form_result = RepoForm(repo_groups=c.repo_groups, - landing_revs=c.landing_revs_choices)()\ + landing_revs=c.landing_revs_choices)() \ .to_python(dict(request.POST)) # create is done sometimes async on celery, db transaction @@ -239,7 +239,7 @@ class ReposController(BaseRepoController c.repo_info = self._load_repo(repo_name) self.__load_defaults(c.repo_info) c.active = 'settings' - c.repo_fields = RepositoryField.query()\ + c.repo_fields = RepositoryField.query() \ .filter(RepositoryField.repository == c.repo_info).all() repo_model = RepoModel() @@ -334,7 +334,7 @@ class ReposController(BaseRepoController """GET /repo_name/settings: Form to edit an existing item""" # url('edit_repo', repo_name=ID) defaults = self.__load_data(repo_name) - c.repo_fields = RepositoryField.query()\ + c.repo_fields = RepositoryField.query() \ .filter(RepositoryField.repository == c.repo_info).all() repo_model = RepoModel() c.users_array = repo_model.get_users_js() @@ -403,7 +403,7 @@ class ReposController(BaseRepoController """GET /repo_name/settings: Form to edit an existing item""" # url('edit_repo', repo_name=ID) c.repo_info = self._load_repo(repo_name) - c.repo_fields = RepositoryField.query()\ + c.repo_fields = RepositoryField.query() \ .filter(RepositoryField.repository == c.repo_info).all() c.active = 'fields' if request.POST: @@ -450,8 +450,8 @@ class ReposController(BaseRepoController # url('edit_repo', repo_name=ID) c.repo_info = self._load_repo(repo_name) c.default_user_id = User.get_default_user().user_id - c.in_public_journal = UserFollowing.query()\ - .filter(UserFollowing.user_id == c.default_user_id)\ + c.in_public_journal = UserFollowing.query() \ + .filter(UserFollowing.user_id == c.default_user_id) \ .filter(UserFollowing.follows_repository == c.repo_info).scalar() _repos = Repository.query().order_by(Repository.repo_name).all() diff --git a/kallithea/controllers/admin/settings.py b/kallithea/controllers/admin/settings.py --- a/kallithea/controllers/admin/settings.py +++ b/kallithea/controllers/admin/settings.py @@ -361,10 +361,10 @@ class SettingsController(BaseController) h.flash(_('Please enter email address'), category='error') raise HTTPFound(location=url('admin_settings_email')) - test_email_txt_body = EmailNotificationModel()\ + test_email_txt_body = EmailNotificationModel() \ .get_email_tmpl(EmailNotificationModel.TYPE_DEFAULT, 'txt', body=test_body) - test_email_html_body = EmailNotificationModel()\ + test_email_html_body = EmailNotificationModel() \ .get_email_tmpl(EmailNotificationModel.TYPE_DEFAULT, 'html', body=test_body) diff --git a/kallithea/controllers/admin/user_groups.py b/kallithea/controllers/admin/user_groups.py --- a/kallithea/controllers/admin/user_groups.py +++ b/kallithea/controllers/admin/user_groups.py @@ -90,8 +90,8 @@ class UserGroupsController(BaseControlle def index(self, format='html'): """GET /users_groups: All items in the collection""" # url('users_groups') - _list = UserGroup.query()\ - .order_by(func.lower(UserGroup.users_group_name))\ + _list = UserGroup.query() \ + .order_by(func.lower(UserGroup.users_group_name)) \ .all() group_iter = UserGroupList(_list, perm_set=['usergroup.admin']) user_groups_data = [] @@ -362,20 +362,20 @@ class UserGroupsController(BaseControlle 'repositories': {}, 'repositories_groups': {} } - ugroup_repo_perms = UserGroupRepoToPerm.query()\ - .options(joinedload(UserGroupRepoToPerm.permission))\ - .options(joinedload(UserGroupRepoToPerm.repository))\ - .filter(UserGroupRepoToPerm.users_group_id == id)\ + ugroup_repo_perms = UserGroupRepoToPerm.query() \ + .options(joinedload(UserGroupRepoToPerm.permission)) \ + .options(joinedload(UserGroupRepoToPerm.repository)) \ + .filter(UserGroupRepoToPerm.users_group_id == id) \ .all() for gr in ugroup_repo_perms: permissions['repositories'][gr.repository.repo_name] \ = gr.permission.permission_name - ugroup_group_perms = UserGroupRepoGroupToPerm.query()\ - .options(joinedload(UserGroupRepoGroupToPerm.permission))\ - .options(joinedload(UserGroupRepoGroupToPerm.group))\ - .filter(UserGroupRepoGroupToPerm.users_group_id == id)\ + ugroup_group_perms = UserGroupRepoGroupToPerm.query() \ + .options(joinedload(UserGroupRepoGroupToPerm.permission)) \ + .options(joinedload(UserGroupRepoGroupToPerm.group)) \ + .filter(UserGroupRepoGroupToPerm.users_group_id == id) \ .all() for gr in ugroup_group_perms: @@ -418,8 +418,8 @@ class UserGroupsController(BaseControlle Session().add(user_group) usergroup_model = UserGroupModel() - defs = UserGroupToPerm.query()\ - .filter(UserGroupToPerm.users_group == user_group)\ + defs = UserGroupToPerm.query() \ + .filter(UserGroupToPerm.users_group == user_group) \ .all() for ug in defs: Session().delete(ug) diff --git a/kallithea/controllers/admin/users.py b/kallithea/controllers/admin/users.py --- a/kallithea/controllers/admin/users.py +++ b/kallithea/controllers/admin/users.py @@ -71,9 +71,9 @@ class UsersController(BaseController): """GET /users: All items in the collection""" # url('users') - c.users_list = User.query().order_by(User.username)\ - .filter(User.username != User.DEFAULT_USER)\ - .order_by(func.lower(User.username))\ + c.users_list = User.query().order_by(User.username) \ + .filter(User.username != User.DEFAULT_USER) \ + .order_by(func.lower(User.username)) \ .all() users_data = [] @@ -362,8 +362,8 @@ class UsersController(BaseController): Session().add(user) user_model = UserModel() - defs = UserToPerm.query()\ - .filter(UserToPerm.user == user)\ + defs = UserToPerm.query() \ + .filter(UserToPerm.user == user) \ .all() for ug in defs: Session().delete(ug) @@ -391,7 +391,7 @@ class UsersController(BaseController): def edit_emails(self, id): c.user = self._get_user_or_raise_if_default(id) c.active = 'emails' - c.user_email_map = UserEmailMap.query()\ + c.user_email_map = UserEmailMap.query() \ .filter(UserEmailMap.user == c.user).all() defaults = c.user.get_dict() @@ -435,11 +435,11 @@ class UsersController(BaseController): def edit_ips(self, id): c.user = self._get_user_or_raise_if_default(id) c.active = 'ips' - c.user_ip_map = UserIpMap.query()\ + c.user_ip_map = UserIpMap.query() \ .filter(UserIpMap.user == c.user).all() c.inherit_default_ips = c.user.inherit_default_permissions - c.default_user_ip_map = UserIpMap.query()\ + c.default_user_ip_map = UserIpMap.query() \ .filter(UserIpMap.user == User.get_default_user()).all() defaults = c.user.get_dict() diff --git a/kallithea/controllers/api/api.py b/kallithea/controllers/api/api.py --- a/kallithea/controllers/api/api.py +++ b/kallithea/controllers/api/api.py @@ -2508,9 +2508,9 @@ class ApiController(JSONRPCController): user_id = get_user_or_error(userid).user_id gists = [] - _gists = Gist().query()\ - .filter(or_(Gist.gist_expires == -1, Gist.gist_expires >= time.time()))\ - .filter(Gist.gist_owner == user_id)\ + _gists = Gist().query() \ + .filter(or_(Gist.gist_expires == -1, Gist.gist_expires >= time.time())) \ + .filter(Gist.gist_owner == user_id) \ .order_by(Gist.created_on.desc()) for gist in _gists: gists.append(gist.get_api_data()) diff --git a/kallithea/controllers/changelog.py b/kallithea/controllers/changelog.py --- a/kallithea/controllers/changelog.py +++ b/kallithea/controllers/changelog.py @@ -38,7 +38,7 @@ from kallithea.lib.base import BaseRepoC from kallithea.lib.helpers import RepoPage from kallithea.lib.compat import json from kallithea.lib.graphmod import graph_data -from kallithea.lib.vcs.exceptions import RepositoryError, ChangesetDoesNotExistError,\ +from kallithea.lib.vcs.exceptions import RepositoryError, ChangesetDoesNotExistError, \ ChangesetError, NodeDoesNotExistError, EmptyRepositoryError from kallithea.lib.utils2 import safe_int, safe_str diff --git a/kallithea/controllers/changeset.py b/kallithea/controllers/changeset.py --- a/kallithea/controllers/changeset.py +++ b/kallithea/controllers/changeset.py @@ -40,7 +40,7 @@ from kallithea.lib.vcs.exceptions import from kallithea.lib.compat import json import kallithea.lib.helpers as h -from kallithea.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator,\ +from kallithea.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator, \ NotAnonymous from kallithea.lib.base import BaseRepoController, render from kallithea.lib.utils import action_logger @@ -242,7 +242,7 @@ class ChangesetController(BaseRepoContro changeset.raw_id, with_revisions=True) if st.changeset_comment_id is not None) - inlines = ChangesetCommentsModel()\ + inlines = ChangesetCommentsModel() \ .get_inline_comments(c.db_repo.repo_id, revision=changeset.raw_id) c.inline_comments.extend(inlines) diff --git a/kallithea/controllers/files.py b/kallithea/controllers/files.py --- a/kallithea/controllers/files.py +++ b/kallithea/controllers/files.py @@ -40,7 +40,7 @@ from kallithea.lib import diffs from kallithea.lib import helpers as h from kallithea.lib.compat import OrderedDict -from kallithea.lib.utils2 import convert_line_endings, detect_mode, safe_str,\ +from kallithea.lib.utils2 import convert_line_endings, detect_mode, safe_str, \ str2bool from kallithea.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator from kallithea.lib.base import BaseRepoController, render @@ -48,7 +48,7 @@ from kallithea.lib.vcs.backends.base imp from kallithea.lib.vcs.conf import settings from kallithea.lib.vcs.exceptions import RepositoryError, \ ChangesetDoesNotExistError, EmptyRepositoryError, \ - ImproperArchiveTypeError, VCSError, NodeAlreadyExistsError,\ + ImproperArchiveTypeError, VCSError, NodeAlreadyExistsError, \ NodeDoesNotExistError, ChangesetError, NodeError from kallithea.lib.vcs.nodes import FileNode @@ -56,7 +56,7 @@ from kallithea.model.repo import RepoMod from kallithea.model.scm import ScmModel from kallithea.model.db import Repository -from kallithea.controllers.changeset import anchor_url, _ignorews_url,\ +from kallithea.controllers.changeset import anchor_url, _ignorews_url, \ _context_url, get_line_ctx, get_ignore_ws from webob.exc import HTTPNotFound from kallithea.lib.exceptions import NonRelativePathError diff --git a/kallithea/controllers/followers.py b/kallithea/controllers/followers.py --- a/kallithea/controllers/followers.py +++ b/kallithea/controllers/followers.py @@ -49,7 +49,7 @@ class FollowersController(BaseRepoContro def followers(self, repo_name): p = safe_int(request.GET.get('page', 1), 1) repo_id = c.db_repo.repo_id - d = UserFollowing.get_repo_followers(repo_id)\ + d = UserFollowing.get_repo_followers(repo_id) \ .order_by(UserFollowing.follows_from) c.followers_pager = Page(d, page=p, items_per_page=20) diff --git a/kallithea/controllers/forks.py b/kallithea/controllers/forks.py --- a/kallithea/controllers/forks.py +++ b/kallithea/controllers/forks.py @@ -80,8 +80,8 @@ class ForksController(BaseRepoController raise HTTPFound(location=url('repos')) c.default_user_id = User.get_default_user().user_id - c.in_public_journal = UserFollowing.query()\ - .filter(UserFollowing.user_id == c.default_user_id)\ + c.in_public_journal = UserFollowing.query() \ + .filter(UserFollowing.user_id == c.default_user_id) \ .filter(UserFollowing.follows_repository == c.repo_info).scalar() if c.repo_info.stats: diff --git a/kallithea/controllers/home.py b/kallithea/controllers/home.py --- a/kallithea/controllers/home.py +++ b/kallithea/controllers/home.py @@ -57,9 +57,9 @@ class HomeController(BaseController): c.groups = self.scm_model.get_repo_groups() c.group = None - c.repos_list = Repository.query()\ - .filter(Repository.group_id == None)\ - .order_by(func.lower(Repository.repo_name))\ + c.repos_list = Repository.query() \ + .filter(Repository.group_id == None) \ + .order_by(func.lower(Repository.repo_name)) \ .all() repos_data = RepoModel().get_repos_as_dict(repos_list=c.repos_list, diff --git a/kallithea/controllers/journal.py b/kallithea/controllers/journal.py --- a/kallithea/controllers/journal.py +++ b/kallithea/controllers/journal.py @@ -92,12 +92,12 @@ class JournalController(BaseController): if not repo_ids and user_ids: filtering_criterion = UserLog.user_id.in_(user_ids) if filtering_criterion is not None: - journal = self.sa.query(UserLog)\ - .options(joinedload(UserLog.user))\ + journal = self.sa.query(UserLog) \ + .options(joinedload(UserLog.user)) \ .options(joinedload(UserLog.repository)) #filter journal = _journal_filter(journal, c.search_term) - journal = journal.filter(filtering_criterion)\ + journal = journal.filter(filtering_criterion) \ .order_by(UserLog.action_date.desc()) else: journal = [] @@ -194,9 +194,9 @@ class JournalController(BaseController): # Return a rendered template p = safe_int(request.GET.get('page', 1), 1) c.user = User.get(self.authuser.user_id) - c.following = self.sa.query(UserFollowing)\ - .filter(UserFollowing.user_id == self.authuser.user_id)\ - .options(joinedload(UserFollowing.follows_repository))\ + c.following = self.sa.query(UserFollowing) \ + .filter(UserFollowing.user_id == self.authuser.user_id) \ + .options(joinedload(UserFollowing.follows_repository)) \ .all() journal = self._get_journal_data(c.following) @@ -210,9 +210,9 @@ class JournalController(BaseController): if request.environ.get('HTTP_X_PARTIAL_XHR'): return render('journal/journal_data.html') - repos_list = Session().query(Repository)\ + repos_list = Session().query(Repository) \ .filter(Repository.user_id == - self.authuser.user_id)\ + self.authuser.user_id) \ .order_by(func.lower(Repository.repo_name)).all() repos_data = RepoModel().get_repos_as_dict(repos_list=repos_list, @@ -280,9 +280,9 @@ class JournalController(BaseController): """ Produce an atom-1.0 feed via feedgenerator module """ - following = self.sa.query(UserFollowing)\ - .filter(UserFollowing.user_id == self.authuser.user_id)\ - .options(joinedload(UserFollowing.follows_repository))\ + following = self.sa.query(UserFollowing) \ + .filter(UserFollowing.user_id == self.authuser.user_id) \ + .options(joinedload(UserFollowing.follows_repository)) \ .all() return self._atom_feed(following, public=False) @@ -292,9 +292,9 @@ class JournalController(BaseController): """ Produce an rss feed via feedgenerator module """ - following = self.sa.query(UserFollowing)\ - .filter(UserFollowing.user_id == self.authuser.user_id)\ - .options(joinedload(UserFollowing.follows_repository))\ + following = self.sa.query(UserFollowing) \ + .filter(UserFollowing.user_id == self.authuser.user_id) \ + .options(joinedload(UserFollowing.follows_repository)) \ .all() return self._rss_feed(following, public=False) @@ -330,9 +330,9 @@ class JournalController(BaseController): # Return a rendered template p = safe_int(request.GET.get('page', 1), 1) - c.following = self.sa.query(UserFollowing)\ - .filter(UserFollowing.user_id == self.authuser.user_id)\ - .options(joinedload(UserFollowing.follows_repository))\ + c.following = self.sa.query(UserFollowing) \ + .filter(UserFollowing.user_id == self.authuser.user_id) \ + .options(joinedload(UserFollowing.follows_repository)) \ .all() journal = self._get_journal_data(c.following) @@ -351,9 +351,9 @@ class JournalController(BaseController): """ Produce an atom-1.0 feed via feedgenerator module """ - c.following = self.sa.query(UserFollowing)\ - .filter(UserFollowing.user_id == self.authuser.user_id)\ - .options(joinedload(UserFollowing.follows_repository))\ + c.following = self.sa.query(UserFollowing) \ + .filter(UserFollowing.user_id == self.authuser.user_id) \ + .options(joinedload(UserFollowing.follows_repository)) \ .all() return self._atom_feed(c.following) @@ -363,9 +363,9 @@ class JournalController(BaseController): """ Produce an rss2 feed via feedgenerator module """ - c.following = self.sa.query(UserFollowing)\ - .filter(UserFollowing.user_id == self.authuser.user_id)\ - .options(joinedload(UserFollowing.follows_repository))\ + c.following = self.sa.query(UserFollowing) \ + .filter(UserFollowing.user_id == self.authuser.user_id) \ + .options(joinedload(UserFollowing.follows_repository)) \ .all() return self._rss_feed(c.following) diff --git a/kallithea/controllers/login.py b/kallithea/controllers/login.py --- a/kallithea/controllers/login.py +++ b/kallithea/controllers/login.py @@ -119,7 +119,7 @@ class LoginController(BaseController): @HasPermissionAnyDecorator('hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate') def register(self): - c.auto_active = 'hg.register.auto_activate' in User.get_default_user()\ + c.auto_active = 'hg.register.auto_activate' in User.get_default_user() \ .AuthUser.permissions['global'] settings = Setting.get_app_settings() diff --git a/kallithea/controllers/pullrequests.py b/kallithea/controllers/pullrequests.py --- a/kallithea/controllers/pullrequests.py +++ b/kallithea/controllers/pullrequests.py @@ -37,7 +37,7 @@ from webob.exc import HTTPFound, HTTPNot from kallithea.lib.vcs.utils.hgcompat import unionrepo from kallithea.lib.compat import json from kallithea.lib.base import BaseRepoController, render -from kallithea.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator,\ +from kallithea.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator, \ NotAnonymous from kallithea.lib.helpers import Page from kallithea.lib import helpers as h @@ -47,7 +47,7 @@ from kallithea.lib.utils import action_l from kallithea.lib.vcs.utils import safe_str from kallithea.lib.vcs.exceptions import EmptyRepositoryError from kallithea.lib.diffs import LimitedDiffContainer -from kallithea.model.db import PullRequest, ChangesetStatus, ChangesetComment,\ +from kallithea.model.db import PullRequest, ChangesetStatus, ChangesetComment, \ PullRequestReviewers, User from kallithea.model.pull_request import PullRequestModel from kallithea.model.meta import Session @@ -210,15 +210,15 @@ class PullrequestsController(BaseRepoCon s = filter(lambda p: p.status != PullRequest.STATUS_CLOSED, s) return s - c.my_pull_requests = _filter(PullRequest.query()\ + c.my_pull_requests = _filter(PullRequest.query() \ .filter(PullRequest.user_id == - self.authuser.user_id)\ + self.authuser.user_id) \ .all()) - c.participate_in_pull_requests = _filter(PullRequest.query()\ - .join(PullRequestReviewers)\ + c.participate_in_pull_requests = _filter(PullRequest.query() \ + .join(PullRequestReviewers) \ .filter(PullRequestReviewers.user_id == - self.authuser.user_id)\ + self.authuser.user_id) \ ) return render('/pullrequests/pullrequest_show_my.html') diff --git a/kallithea/controllers/summary.py b/kallithea/controllers/summary.py --- a/kallithea/controllers/summary.py +++ b/kallithea/controllers/summary.py @@ -44,7 +44,7 @@ from kallithea.config.conf import ALL_RE from kallithea.model.db import Statistics, CacheInvalidation, User from kallithea.lib.utils import jsonify from kallithea.lib.utils2 import safe_str -from kallithea.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator,\ +from kallithea.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator, \ NotAnonymous from kallithea.lib.base import BaseRepoController, render from kallithea.lib.vcs.backends.base import EmptyChangeset @@ -135,8 +135,8 @@ class SummaryController(BaseRepoControll else: c.show_stats = False - stats = self.sa.query(Statistics)\ - .filter(Statistics.repository == c.db_repo)\ + stats = self.sa.query(Statistics) \ + .filter(Statistics.repository == c.db_repo) \ .scalar() c.stats_percentage = 0 @@ -193,8 +193,8 @@ class SummaryController(BaseRepoControll c.ts_min = ts_min_m c.ts_max = ts_max_y - stats = self.sa.query(Statistics)\ - .filter(Statistics.repository == c.db_repo)\ + stats = self.sa.query(Statistics) \ + .filter(Statistics.repository == c.db_repo) \ .scalar() c.stats_percentage = 0 if stats and stats.languages: @@ -211,7 +211,7 @@ class SummaryController(BaseRepoControll sorted(lang_stats, reverse=True, key=lambda k: k[1])[:10] ) last_rev = stats.stat_on_revision + 1 - c.repo_last_rev = c.db_repo_scm_instance.count()\ + c.repo_last_rev = c.db_repo_scm_instance.count() \ if c.db_repo_scm_instance.revisions else 0 if last_rev == 0 or c.repo_last_rev == 0: pass diff --git a/kallithea/lib/annotate.py b/kallithea/lib/annotate.py --- a/kallithea/lib/annotate.py +++ b/kallithea/lib/annotate.py @@ -68,7 +68,7 @@ class AnnotateHtmlFormatter(HtmlFormatte following function as ``annotate_from_changeset_func``:: def changeset_to_anchor(changeset): - return '%s\n' %\ + return '%s\n' % \ (changeset.id, changeset.id) :param annotate_from_changeset_func: see above diff --git a/kallithea/lib/auth.py b/kallithea/lib/auth.py --- a/kallithea/lib/auth.py +++ b/kallithea/lib/auth.py @@ -204,8 +204,8 @@ def _cached_perms_data(user_id, user_is_ #================================================================== # default global permissions taken from the default user - default_global_perms = UserToPerm.query()\ - .filter(UserToPerm.user_id == default_user_id)\ + default_global_perms = UserToPerm.query() \ + .filter(UserToPerm.user_id == default_user_id) \ .options(joinedload(UserToPerm.permission)) for perm in default_global_perms: @@ -251,15 +251,15 @@ def _cached_perms_data(user_id, user_is_ # USER GROUPS comes first # user group global permissions - user_perms_from_users_groups = Session().query(UserGroupToPerm)\ - .options(joinedload(UserGroupToPerm.permission))\ + user_perms_from_users_groups = Session().query(UserGroupToPerm) \ + .options(joinedload(UserGroupToPerm.permission)) \ .join((UserGroupMember, UserGroupToPerm.users_group_id == - UserGroupMember.users_group_id))\ - .filter(UserGroupMember.user_id == user_id)\ + UserGroupMember.users_group_id)) \ + .filter(UserGroupMember.user_id == user_id) \ .join((UserGroup, UserGroupMember.users_group_id == - UserGroup.users_group_id))\ - .filter(UserGroup.users_group_active == True)\ - .order_by(UserGroupToPerm.users_group_id)\ + UserGroup.users_group_id)) \ + .filter(UserGroup.users_group_active == True) \ + .order_by(UserGroupToPerm.users_group_id) \ .all() # need to group here by groups since user can be in more than # one group @@ -273,20 +273,20 @@ def _cached_perms_data(user_id, user_is_ if not gr.inherit_default_permissions: # NEED TO IGNORE all configurable permissions and # replace them with explicitly set - permissions[GLOBAL] = permissions[GLOBAL]\ + permissions[GLOBAL] = permissions[GLOBAL] \ .difference(_configurable) for perm in perms: permissions[GLOBAL].add(perm.permission.permission_name) # user specific global permissions - user_perms = Session().query(UserToPerm)\ - .options(joinedload(UserToPerm.permission))\ + user_perms = Session().query(UserToPerm) \ + .options(joinedload(UserToPerm.permission)) \ .filter(UserToPerm.user_id == user_id).all() if not user_inherit_default_permissions: # NEED TO IGNORE all configurable permissions and # replace them with explicitly set - permissions[GLOBAL] = permissions[GLOBAL]\ + permissions[GLOBAL] = permissions[GLOBAL] \ .difference(_configurable) for perm in user_perms: @@ -304,17 +304,17 @@ def _cached_perms_data(user_id, user_is_ # user group for repositories permissions user_repo_perms_from_users_groups = \ - Session().query(UserGroupRepoToPerm, Permission, Repository,)\ + Session().query(UserGroupRepoToPerm, Permission, Repository,) \ .join((Repository, UserGroupRepoToPerm.repository_id == - Repository.repo_id))\ + Repository.repo_id)) \ .join((Permission, UserGroupRepoToPerm.permission_id == - Permission.permission_id))\ + Permission.permission_id)) \ .join((UserGroup, UserGroupRepoToPerm.users_group_id == - UserGroup.users_group_id))\ - .filter(UserGroup.users_group_active == True)\ + UserGroup.users_group_id)) \ + .filter(UserGroup.users_group_active == True) \ .join((UserGroupMember, UserGroupRepoToPerm.users_group_id == - UserGroupMember.users_group_id))\ - .filter(UserGroupMember.user_id == user_id)\ + UserGroupMember.users_group_id)) \ + .filter(UserGroupMember.user_id == user_id) \ .all() multiple_counter = collections.defaultdict(int) @@ -357,16 +357,16 @@ def _cached_perms_data(user_id, user_is_ #====================================================================== # user group for repo groups permissions user_repo_group_perms_from_users_groups = \ - Session().query(UserGroupRepoGroupToPerm, Permission, RepoGroup)\ - .join((RepoGroup, UserGroupRepoGroupToPerm.group_id == RepoGroup.group_id))\ + Session().query(UserGroupRepoGroupToPerm, Permission, RepoGroup) \ + .join((RepoGroup, UserGroupRepoGroupToPerm.group_id == RepoGroup.group_id)) \ .join((Permission, UserGroupRepoGroupToPerm.permission_id - == Permission.permission_id))\ + == Permission.permission_id)) \ .join((UserGroup, UserGroupRepoGroupToPerm.users_group_id == - UserGroup.users_group_id))\ - .filter(UserGroup.users_group_active == True)\ + UserGroup.users_group_id)) \ + .filter(UserGroup.users_group_active == True) \ .join((UserGroupMember, UserGroupRepoGroupToPerm.users_group_id - == UserGroupMember.users_group_id))\ - .filter(UserGroupMember.user_id == user_id)\ + == UserGroupMember.users_group_id)) \ + .filter(UserGroupMember.user_id == user_id) \ .all() multiple_counter = collections.defaultdict(int) @@ -394,17 +394,17 @@ def _cached_perms_data(user_id, user_is_ #====================================================================== # user group for user group permissions user_group_user_groups_perms = \ - Session().query(UserGroupUserGroupToPerm, Permission, UserGroup)\ + Session().query(UserGroupUserGroupToPerm, Permission, UserGroup) \ .join((UserGroup, UserGroupUserGroupToPerm.target_user_group_id - == UserGroup.users_group_id))\ + == UserGroup.users_group_id)) \ .join((Permission, UserGroupUserGroupToPerm.permission_id - == Permission.permission_id))\ + == Permission.permission_id)) \ .join((UserGroupMember, UserGroupUserGroupToPerm.user_group_id - == UserGroupMember.users_group_id))\ - .filter(UserGroupMember.user_id == user_id)\ + == UserGroupMember.users_group_id)) \ + .filter(UserGroupMember.user_id == user_id) \ .join((UserGroup, UserGroupMember.users_group_id == - UserGroup.users_group_id), aliased=True, from_joinpoint=True)\ - .filter(UserGroup.users_group_active == True)\ + UserGroup.users_group_id), aliased=True, from_joinpoint=True) \ + .filter(UserGroup.users_group_active == True) \ .all() multiple_counter = collections.defaultdict(int) @@ -566,8 +566,8 @@ class AuthUser(object): def _get_api_keys(self): api_keys = [self.api_key] - for api_key in UserApiKeys.query()\ - .filter(UserApiKeys.user_id == self.user_id)\ + for api_key in UserApiKeys.query() \ + .filter(UserApiKeys.user_id == self.user_id) \ .filter(or_(UserApiKeys.expires == -1, UserApiKeys.expires >= time.time())).all(): api_keys.append(api_key.api_key) @@ -619,7 +619,7 @@ class AuthUser(object): return False def __repr__(self): - return ""\ + return "" \ % (self.user_id, self.username, (self.is_authenticated or self.is_default_user)) def to_cookie(self): diff --git a/kallithea/lib/base.py b/kallithea/lib/base.py --- a/kallithea/lib/base.py +++ b/kallithea/lib/base.py @@ -45,7 +45,7 @@ from pylons.i18n.translation import _ from kallithea import __version__, BACKENDS -from kallithea.lib.utils2 import str2bool, safe_unicode, AttributeDict,\ +from kallithea.lib.utils2 import str2bool, safe_unicode, AttributeDict, \ safe_str, safe_int from kallithea.lib import auth_modules from kallithea.lib.auth import AuthUser, HasPermissionAnyMiddleware @@ -367,7 +367,7 @@ class BaseController(WSGIController): c.repo_name = get_repo_slug(request) # can be empty c.backends = BACKENDS.keys() - c.unread_notifications = NotificationModel()\ + c.unread_notifications = NotificationModel() \ .get_unread_cnt_for_user(c.authuser.user_id) self.cut_off_limit = safe_int(config.get('cut_off_limit')) diff --git a/kallithea/lib/celerylib/tasks.py b/kallithea/lib/celerylib/tasks.py --- a/kallithea/lib/celerylib/tasks.py +++ b/kallithea/lib/celerylib/tasks.py @@ -76,7 +76,7 @@ def whoosh_index(repo_location, full_ind index_location = config['index_dir'] WhooshIndexingDaemon(index_location=index_location, - repo_location=repo_location, sa=DBS)\ + repo_location=repo_location, sa=DBS) \ .run(full_index=full_index) @@ -116,9 +116,9 @@ def get_commits_stats(repo_name, ts_min_ last_cs = None timegetter = itemgetter('time') - dbrepo = DBS.query(Repository)\ + dbrepo = DBS.query(Repository) \ .filter(Repository.repo_name == repo_name).scalar() - cur_stats = DBS.query(Statistics)\ + cur_stats = DBS.query(Statistics) \ .filter(Statistics.repository == dbrepo).scalar() if cur_stats is not None: @@ -176,7 +176,7 @@ def get_commits_stats(repo_name, ts_min_ "changed": len(cs.changed), "removed": len(cs.removed), } - co_day_auth_aggr[akc(cs.author)]['data']\ + co_day_auth_aggr[akc(cs.author)]['data'] \ .append(datadict) else: diff --git a/kallithea/lib/colored_formatter.py b/kallithea/lib/colored_formatter.py --- a/kallithea/lib/colored_formatter.py +++ b/kallithea/lib/colored_formatter.py @@ -42,19 +42,19 @@ def one_space_trim(s): def format_sql(sql): sql = sql.replace('\n', '') sql = one_space_trim(sql) - sql = sql\ - .replace(',', ',\n\t')\ - .replace('SELECT', '\n\tSELECT \n\t')\ - .replace('UPDATE', '\n\tUPDATE \n\t')\ - .replace('DELETE', '\n\tDELETE \n\t')\ - .replace('FROM', '\n\tFROM')\ - .replace('ORDER BY', '\n\tORDER BY')\ - .replace('LIMIT', '\n\tLIMIT')\ - .replace('WHERE', '\n\tWHERE')\ - .replace('AND', '\n\tAND')\ - .replace('LEFT', '\n\tLEFT')\ - .replace('INNER', '\n\tINNER')\ - .replace('INSERT', '\n\tINSERT')\ + sql = sql \ + .replace(',', ',\n\t') \ + .replace('SELECT', '\n\tSELECT \n\t') \ + .replace('UPDATE', '\n\tUPDATE \n\t') \ + .replace('DELETE', '\n\tDELETE \n\t') \ + .replace('FROM', '\n\tFROM') \ + .replace('ORDER BY', '\n\tORDER BY') \ + .replace('LIMIT', '\n\tLIMIT') \ + .replace('WHERE', '\n\tWHERE') \ + .replace('AND', '\n\tAND') \ + .replace('LEFT', '\n\tLEFT') \ + .replace('INNER', '\n\tINNER') \ + .replace('INSERT', '\n\tINSERT') \ .replace('DELETE', '\n\tDELETE') return sql diff --git a/kallithea/lib/db_manage.py b/kallithea/lib/db_manage.py --- a/kallithea/lib/db_manage.py +++ b/kallithea/lib/db_manage.py @@ -184,8 +184,8 @@ class DbManage(object): Fixes a old kallithea version path into new one without a '*' """ - paths = self.sa.query(Ui)\ - .filter(Ui.ui_key == '/')\ + paths = self.sa.query(Ui) \ + .filter(Ui.ui_key == '/') \ .scalar() paths.ui_value = paths.ui_value.replace('*', '') @@ -198,8 +198,8 @@ class DbManage(object): Fixes a old default user with some 'nicer' default values, used mostly for anonymous access """ - def_user = self.sa.query(User)\ - .filter(User.username == User.DEFAULT_USER)\ + def_user = self.sa.query(User) \ + .filter(User.username == User.DEFAULT_USER) \ .one() def_user.name = 'Anonymous' @@ -278,7 +278,7 @@ class DbManage(object): #HOOKS hooks1_key = Ui.HOOK_UPDATE - hooks1_ = self.sa.query(Ui)\ + hooks1_ = self.sa.query(Ui) \ .filter(Ui.ui_key == hooks1_key).scalar() hooks1 = Ui() if hooks1_ is None else hooks1_ @@ -289,7 +289,7 @@ class DbManage(object): self.sa.add(hooks1) hooks2_key = Ui.HOOK_REPO_SIZE - hooks2_ = self.sa.query(Ui)\ + hooks2_ = self.sa.query(Ui) \ .filter(Ui.ui_key == hooks2_key).scalar() hooks2 = Ui() if hooks2_ is None else hooks2_ hooks2.ui_section = 'hooks' @@ -390,9 +390,9 @@ class DbManage(object): g.group_name = g.get_new_name(g.name) self.sa.add(g) # get default perm - default = UserRepoGroupToPerm.query()\ - .filter(UserRepoGroupToPerm.group == g)\ - .filter(UserRepoGroupToPerm.user == def_usr)\ + default = UserRepoGroupToPerm.query() \ + .filter(UserRepoGroupToPerm.group == g) \ + .filter(UserRepoGroupToPerm.user == def_usr) \ .scalar() if default is None: @@ -411,7 +411,7 @@ class DbManage(object): if not default_user: return - u2p = UserToPerm.query()\ + u2p = UserToPerm.query() \ .filter(UserToPerm.user == default_user).all() fixed = False if len(u2p) != len(Permission.DEFAULT_USER_PERMISSIONS): diff --git a/kallithea/lib/dbmigrate/migrate/changeset/constraint.py b/kallithea/lib/dbmigrate/migrate/changeset/constraint.py --- a/kallithea/lib/dbmigrate/migrate/changeset/constraint.py +++ b/kallithea/lib/dbmigrate/migrate/changeset/constraint.py @@ -146,7 +146,7 @@ class CheckConstraint(ConstraintChangese Migrate's additional parameters: :param sqltext: Plain SQL text to check condition - :param columns: If not name is applied, you must supply this kw\ + :param columns: If not name is applied, you must supply this kw \ to autoname constraint :param table: If columns are passed as strings, this kw is required :type table: Table instance diff --git a/kallithea/lib/dbmigrate/migrate/changeset/schema.py b/kallithea/lib/dbmigrate/migrate/changeset/schema.py --- a/kallithea/lib/dbmigrate/migrate/changeset/schema.py +++ b/kallithea/lib/dbmigrate/migrate/changeset/schema.py @@ -180,7 +180,7 @@ class ColumnDelta(DictMixin, sqlalchemy. * **current_col_name, \*p, \*\*kw** Table kw must specified. - :param table: Table at which current Column should be bound to.\ + :param table: Table at which current Column should be bound to. \ If table name is given, reflection will be used. :type table: string or Table instance @@ -499,9 +499,9 @@ class ChangesetColumn(object): :param table: Table instance to create on. :param index_name: Creates :class:`ChangesetIndex` on this column. - :param unique_name: Creates :class:\ + :param unique_name: Creates :class: \ `~migrate.changeset.constraint.UniqueConstraint` on this column. - :param primary_key_name: Creates :class:\ + :param primary_key_name: Creates :class: \ `~migrate.changeset.constraint.PrimaryKeyConstraint` on this column. :param populate_default: If True, created column will be \ populated with defaults diff --git a/kallithea/lib/dbmigrate/migrate/versioning/api.py b/kallithea/lib/dbmigrate/migrate/versioning/api.py --- a/kallithea/lib/dbmigrate/migrate/versioning/api.py +++ b/kallithea/lib/dbmigrate/migrate/versioning/api.py @@ -181,7 +181,7 @@ def upgrade(url, repository, version=Non You may preview the Python or SQL code to be executed, rather than actually executing it, using the appropriate 'preview' option. """ - err = "Cannot upgrade a database of version %s to version %s. "\ + err = "Cannot upgrade a database of version %s to version %s. " \ "Try 'downgrade' instead." return _migrate(url, repository, version, upgrade=True, err=err, **opts) @@ -197,7 +197,7 @@ def downgrade(url, repository, version, You may preview the Python or SQL code to be executed, rather than actually executing it, using the appropriate 'preview' option. """ - err = "Cannot downgrade a database of version %s to version %s. "\ + err = "Cannot downgrade a database of version %s to version %s. " \ "Try 'upgrade' instead." return _migrate(url, repository, version, upgrade=False, err=err, **opts) diff --git a/kallithea/lib/dbmigrate/migrate/versioning/repository.py b/kallithea/lib/dbmigrate/migrate/versioning/repository.py --- a/kallithea/lib/dbmigrate/migrate/versioning/repository.py +++ b/kallithea/lib/dbmigrate/migrate/versioning/repository.py @@ -238,7 +238,7 @@ class Repository(pathed.Pathed): :param file_: Destination file to be written :param opts: Options that are passed to :func:`migrate.versioning.shell.main` """ - mng_file = Template(opts.pop('templates_path', None))\ + mng_file = Template(opts.pop('templates_path', None)) \ .get_manage(theme=opts.pop('templates_theme', None)) tmpl = open(mng_file).read() diff --git a/kallithea/lib/dbmigrate/schema/db_1_2_0.py b/kallithea/lib/dbmigrate/schema/db_1_2_0.py --- a/kallithea/lib/dbmigrate/schema/db_1_2_0.py +++ b/kallithea/lib/dbmigrate/schema/db_1_2_0.py @@ -182,7 +182,7 @@ class Setting(Base, BaseModel): @classmethod def get_by_name(cls, ldap_key): - return cls.query()\ + return cls.query() \ .filter(cls.app_settings_name == ldap_key).scalar() @classmethod @@ -204,7 +204,7 @@ class Setting(Base, BaseModel): @classmethod def get_ldap_settings(cls, cache=False): - ret = cls.query()\ + ret = cls.query() \ .filter(cls.app_settings_name.startswith('ldap_')).all() fd = {} for row in ret: @@ -380,10 +380,10 @@ class UserGroup(Base, BaseModel): @classmethod def get_by_group_name(cls, group_name, cache=False, case_insensitive=False): if case_insensitive: - gr = cls.query()\ + gr = cls.query() \ .filter(cls.users_group_name.ilike(group_name)) else: - gr = cls.query()\ + gr = cls.query() \ .filter(cls.users_group_name == group_name) if cache: gr = gr.options(FromCache("sql_cache_short", @@ -445,7 +445,7 @@ class UserGroup(Base, BaseModel): try: # check if this group is not assigned to repo - assigned_groups = UserGroupRepoToPerm.query()\ + assigned_groups = UserGroupRepoToPerm.query() \ .filter(UserGroupRepoToPerm.users_group_id == users_group_id).all() @@ -526,8 +526,8 @@ class Repository(Base, BaseModel): @classmethod def get_by_repo_name(cls, repo_name): q = Session.query(cls).filter(cls.repo_name == repo_name) - q = q.options(joinedload(Repository.fork))\ - .options(joinedload(Repository.user))\ + q = q.options(joinedload(Repository.fork)) \ + .options(joinedload(Repository.user)) \ .options(joinedload(Repository.group)) return q.one() @@ -616,7 +616,7 @@ class Repository(Base, BaseModel): baseui._tcfg = config.config() - ret = Ui.query()\ + ret = Ui.query() \ .options(FromCache("sql_cache_short", "repository_repo_ui")).all() hg_ui = ret @@ -758,10 +758,10 @@ class Group(Base, BaseModel): @classmethod def get_by_group_name(cls, group_name, cache=False, case_insensitive=False): if case_insensitive: - gr = cls.query()\ + gr = cls.query() \ .filter(cls.group_name.ilike(group_name)) else: - gr = cls.query()\ + gr = cls.query() \ .filter(cls.group_name == group_name) if cache: gr = gr.options(FromCache("sql_cache_short", @@ -879,7 +879,7 @@ class UserToPerm(Base, BaseModel): if not isinstance(perm, Permission): raise Exception('perm needs to be an instance of Permission class') - return cls.query().filter(cls.user_id == user_id)\ + return cls.query().filter(cls.user_id == user_id) \ .filter(cls.permission == perm).scalar() is not None @classmethod @@ -941,8 +941,8 @@ class UserGroupToPerm(Base, BaseModel): raise Exception('perm needs to be an instance of Permission class') return cls.query().filter(cls.users_group_id == - users_group_id)\ - .filter(cls.permission == perm)\ + users_group_id) \ + .filter(cls.permission == perm) \ .scalar() is not None @classmethod @@ -1047,9 +1047,9 @@ class CacheInvalidation(Base, BaseModel) :param key: """ - return cls.query()\ - .filter(CacheInvalidation.cache_key == key)\ - .filter(CacheInvalidation.cache_active == False)\ + return cls.query() \ + .filter(CacheInvalidation.cache_key == key) \ + .filter(CacheInvalidation.cache_active == False) \ .scalar() @classmethod @@ -1061,7 +1061,7 @@ class CacheInvalidation(Base, BaseModel) """ log.debug('marking %s for invalidation', key) - inv_obj = Session.query(cls)\ + inv_obj = Session.query(cls) \ .filter(cls.cache_key == key).scalar() if inv_obj: inv_obj.cache_active = False @@ -1083,7 +1083,7 @@ class CacheInvalidation(Base, BaseModel) :param key: """ - inv_obj = Session.query(CacheInvalidation)\ + inv_obj = Session.query(CacheInvalidation) \ .filter(CacheInvalidation.cache_key == key).scalar() inv_obj.cache_active = True Session.add(inv_obj) diff --git a/kallithea/lib/dbmigrate/schema/db_1_3_0.py b/kallithea/lib/dbmigrate/schema/db_1_3_0.py --- a/kallithea/lib/dbmigrate/schema/db_1_3_0.py +++ b/kallithea/lib/dbmigrate/schema/db_1_3_0.py @@ -201,7 +201,7 @@ class Setting(Base, BaseModel): @classmethod def get_by_name(cls, ldap_key): - return cls.query()\ + return cls.query() \ .filter(cls.app_settings_name == ldap_key).scalar() @classmethod @@ -223,7 +223,7 @@ class Setting(Base, BaseModel): @classmethod def get_ldap_settings(cls, cache=False): - ret = cls.query()\ + ret = cls.query() \ .filter(cls.app_settings_name.startswith('ldap_')).all() fd = {} for row in ret: @@ -533,8 +533,8 @@ class Repository(Base, BaseModel): @classmethod def get_by_repo_name(cls, repo_name): q = Session.query(cls).filter(cls.repo_name == repo_name) - q = q.options(joinedload(Repository.fork))\ - .options(joinedload(Repository.user))\ + q = q.options(joinedload(Repository.fork)) \ + .options(joinedload(Repository.user)) \ .options(joinedload(Repository.group)) return q.scalar() @@ -549,7 +549,7 @@ class Repository(Base, BaseModel): :param cls: """ - q = Session.query(Ui)\ + q = Session.query(Ui) \ .filter(Ui.ui_key == cls.url_sep()) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value @@ -622,7 +622,7 @@ class Repository(Base, BaseModel): baseui._ucfg = config.config() baseui._tcfg = config.config() - ret = Ui.query()\ + ret = Ui.query() \ .options(FromCache("sql_cache_short", "repository_repo_ui")).all() hg_ui = ret @@ -671,7 +671,7 @@ class Repository(Base, BaseModel): :param revisions: filter query by revisions only """ - cmts = ChangesetComment.query()\ + cmts = ChangesetComment.query() \ .filter(ChangesetComment.repo == self) if revisions: cmts = cmts.filter(ChangesetComment.revision.in_(revisions)) @@ -783,10 +783,10 @@ class RepoGroup(Base, BaseModel): @classmethod def get_by_group_name(cls, group_name, cache=False, case_insensitive=False): if case_insensitive: - gr = cls.query()\ + gr = cls.query() \ .filter(cls.group_name.ilike(group_name)) else: - gr = cls.query()\ + gr = cls.query() \ .filter(cls.group_name == group_name) if cache: gr = gr.options(FromCache( @@ -838,8 +838,8 @@ class RepoGroup(Base, BaseModel): @property def repositories(self): - return Repository.query()\ - .filter(Repository.group == self)\ + return Repository.query() \ + .filter(Repository.group == self) \ .order_by(Repository.repo_name) @property @@ -887,18 +887,18 @@ class Permission(Base, BaseModel): @classmethod def get_default_perms(cls, default_user_id): - q = Session.query(UserRepoToPerm, Repository, cls)\ - .join((Repository, UserRepoToPerm.repository_id == Repository.repo_id))\ - .join((cls, UserRepoToPerm.permission_id == cls.permission_id))\ + q = Session.query(UserRepoToPerm, Repository, cls) \ + .join((Repository, UserRepoToPerm.repository_id == Repository.repo_id)) \ + .join((cls, UserRepoToPerm.permission_id == cls.permission_id)) \ .filter(UserRepoToPerm.user_id == default_user_id) return q.all() @classmethod def get_default_group_perms(cls, default_user_id): - q = Session.query(UserRepoGroupToPerm, RepoGroup, cls)\ - .join((RepoGroup, UserRepoGroupToPerm.group_id == RepoGroup.group_id))\ - .join((cls, UserRepoGroupToPerm.permission_id == cls.permission_id))\ + q = Session.query(UserRepoGroupToPerm, RepoGroup, cls) \ + .join((RepoGroup, UserRepoGroupToPerm.group_id == RepoGroup.group_id)) \ + .join((cls, UserRepoGroupToPerm.permission_id == cls.permission_id)) \ .filter(UserRepoGroupToPerm.user_id == default_user_id) return q.all() @@ -1204,8 +1204,8 @@ class ChangesetComment(Base, BaseModel): :param cls: :param revision: """ - return Session.query(User)\ - .filter(cls.revision == revision)\ + return Session.query(User) \ + .filter(cls.revision == revision) \ .join(ChangesetComment.author).all() @@ -1234,7 +1234,7 @@ class Notification(Base, BaseModel): @property def recipients(self): - return [x.user for x in UserNotification.query()\ + return [x.user for x in UserNotification.query() \ .filter(UserNotification.notification == self).all()] @classmethod diff --git a/kallithea/lib/dbmigrate/schema/db_1_4_0.py b/kallithea/lib/dbmigrate/schema/db_1_4_0.py --- a/kallithea/lib/dbmigrate/schema/db_1_4_0.py +++ b/kallithea/lib/dbmigrate/schema/db_1_4_0.py @@ -191,7 +191,7 @@ class Setting(Base, BaseModel): @classmethod def get_by_name(cls, key): - return cls.query()\ + return cls.query() \ .filter(cls.app_settings_name == key).scalar() @classmethod @@ -220,7 +220,7 @@ class Setting(Base, BaseModel): @classmethod def get_ldap_settings(cls, cache=False): - ret = cls.query()\ + ret = cls.query() \ .filter(cls.app_settings_name.startswith('ldap_')).all() fd = {} for row in ret: @@ -672,8 +672,8 @@ class Repository(Base, BaseModel): @classmethod def get_by_repo_name(cls, repo_name): q = Session().query(cls).filter(cls.repo_name == repo_name) - q = q.options(joinedload(Repository.fork))\ - .options(joinedload(Repository.user))\ + q = q.options(joinedload(Repository.fork)) \ + .options(joinedload(Repository.user)) \ .options(joinedload(Repository.group)) return q.scalar() @@ -693,7 +693,7 @@ class Repository(Base, BaseModel): :param cls: """ - q = Session().query(Ui)\ + q = Session().query(Ui) \ .filter(Ui.ui_key == cls.url_sep()) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value @@ -762,9 +762,9 @@ class Repository(Base, BaseModel): """ Returns associated cache keys for that repo """ - return CacheInvalidation.query()\ - .filter(CacheInvalidation.cache_args == self.repo_name)\ - .order_by(CacheInvalidation.cache_key)\ + return CacheInvalidation.query() \ + .filter(CacheInvalidation.cache_args == self.repo_name) \ + .order_by(CacheInvalidation.cache_key) \ .all() def get_new_name(self, repo_name): @@ -886,7 +886,7 @@ class Repository(Base, BaseModel): :param revisions: filter query by revisions only """ - cmts = ChangesetComment.query()\ + cmts = ChangesetComment.query() \ .filter(ChangesetComment.repo == self) if revisions: cmts = cmts.filter(ChangesetComment.revision.in_(revisions)) @@ -903,8 +903,8 @@ class Repository(Base, BaseModel): :type revisions: list """ - statuses = ChangesetStatus.query()\ - .filter(ChangesetStatus.repo == self)\ + statuses = ChangesetStatus.query() \ + .filter(ChangesetStatus.repo == self) \ .filter(ChangesetStatus.version == 0) if revisions: statuses = statuses.filter(ChangesetStatus.revision.in_(revisions)) @@ -1051,10 +1051,10 @@ class RepoGroup(Base, BaseModel): @classmethod def get_by_group_name(cls, group_name, cache=False, case_insensitive=False): if case_insensitive: - gr = cls.query()\ + gr = cls.query() \ .filter(cls.group_name.ilike(group_name)) else: - gr = cls.query()\ + gr = cls.query() \ .filter(cls.group_name == group_name) if cache: gr = gr.options(FromCache( @@ -1106,8 +1106,8 @@ class RepoGroup(Base, BaseModel): @property def repositories(self): - return Repository.query()\ - .filter(Repository.group == self)\ + return Repository.query() \ + .filter(Repository.group == self) \ .order_by(Repository.repo_name) @property @@ -1216,18 +1216,18 @@ class Permission(Base, BaseModel): @classmethod def get_default_perms(cls, default_user_id): - q = Session().query(UserRepoToPerm, Repository, cls)\ - .join((Repository, UserRepoToPerm.repository_id == Repository.repo_id))\ - .join((cls, UserRepoToPerm.permission_id == cls.permission_id))\ + q = Session().query(UserRepoToPerm, Repository, cls) \ + .join((Repository, UserRepoToPerm.repository_id == Repository.repo_id)) \ + .join((cls, UserRepoToPerm.permission_id == cls.permission_id)) \ .filter(UserRepoToPerm.user_id == default_user_id) return q.all() @classmethod def get_default_group_perms(cls, default_user_id): - q = Session().query(UserRepoGroupToPerm, RepoGroup, cls)\ - .join((RepoGroup, UserRepoGroupToPerm.group_id == RepoGroup.group_id))\ - .join((cls, UserRepoGroupToPerm.permission_id == cls.permission_id))\ + q = Session().query(UserRepoGroupToPerm, RepoGroup, cls) \ + .join((RepoGroup, UserRepoGroupToPerm.group_id == RepoGroup.group_id)) \ + .join((cls, UserRepoGroupToPerm.permission_id == cls.permission_id)) \ .filter(UserRepoGroupToPerm.user_id == default_user_id) return q.all() @@ -1596,7 +1596,7 @@ class ChangesetComment(Base, BaseModel): :param cls: :param revision: """ - q = Session().query(User)\ + q = Session().query(User) \ .join(ChangesetComment.author) if revision: q = q.filter(cls.revision == revision) @@ -1753,8 +1753,8 @@ class Notification(Base, BaseModel): @property def recipients(self): - return [x.user for x in UserNotification.query()\ - .filter(UserNotification.notification == self)\ + return [x.user for x in UserNotification.query() \ + .filter(UserNotification.notification == self) \ .order_by(UserNotification.user_id.asc()).all()] @classmethod diff --git a/kallithea/lib/dbmigrate/schema/db_1_5_0.py b/kallithea/lib/dbmigrate/schema/db_1_5_0.py --- a/kallithea/lib/dbmigrate/schema/db_1_5_0.py +++ b/kallithea/lib/dbmigrate/schema/db_1_5_0.py @@ -194,7 +194,7 @@ class Setting(Base, BaseModel): @classmethod def get_by_name(cls, key): - return cls.query()\ + return cls.query() \ .filter(cls.app_settings_name == key).scalar() @classmethod @@ -223,7 +223,7 @@ class Setting(Base, BaseModel): @classmethod def get_ldap_settings(cls, cache=False): - ret = cls.query()\ + ret = cls.query() \ .filter(cls.app_settings_name.startswith('ldap_')).all() fd = {} for row in ret: @@ -233,7 +233,7 @@ class Setting(Base, BaseModel): @classmethod def get_default_repo_settings(cls, cache=False, strip_prefix=False): - ret = cls.query()\ + ret = cls.query() \ .filter(cls.app_settings_name.startswith('default_')).all() fd = {} for row in ret: @@ -691,8 +691,8 @@ class Repository(Base, BaseModel): @classmethod def get_by_repo_name(cls, repo_name): q = Session().query(cls).filter(cls.repo_name == repo_name) - q = q.options(joinedload(Repository.fork))\ - .options(joinedload(Repository.user))\ + q = q.options(joinedload(Repository.fork)) \ + .options(joinedload(Repository.user)) \ .options(joinedload(Repository.group)) return q.scalar() @@ -712,7 +712,7 @@ class Repository(Base, BaseModel): :param cls: """ - q = Session().query(Ui)\ + q = Session().query(Ui) \ .filter(Ui.ui_key == cls.url_sep()) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value @@ -781,9 +781,9 @@ class Repository(Base, BaseModel): """ Returns associated cache keys for that repo """ - return CacheInvalidation.query()\ - .filter(CacheInvalidation.cache_args == self.repo_name)\ - .order_by(CacheInvalidation.cache_key)\ + return CacheInvalidation.query() \ + .filter(CacheInvalidation.cache_args == self.repo_name) \ + .order_by(CacheInvalidation.cache_key) \ .all() def get_new_name(self, repo_name): @@ -905,7 +905,7 @@ class Repository(Base, BaseModel): :param revisions: filter query by revisions only """ - cmts = ChangesetComment.query()\ + cmts = ChangesetComment.query() \ .filter(ChangesetComment.repo == self) if revisions: cmts = cmts.filter(ChangesetComment.revision.in_(revisions)) @@ -922,8 +922,8 @@ class Repository(Base, BaseModel): :type revisions: list """ - statuses = ChangesetStatus.query()\ - .filter(ChangesetStatus.repo == self)\ + statuses = ChangesetStatus.query() \ + .filter(ChangesetStatus.repo == self) \ .filter(ChangesetStatus.version == 0) if revisions: statuses = statuses.filter(ChangesetStatus.revision.in_(revisions)) @@ -1070,10 +1070,10 @@ class RepoGroup(Base, BaseModel): @classmethod def get_by_group_name(cls, group_name, cache=False, case_insensitive=False): if case_insensitive: - gr = cls.query()\ + gr = cls.query() \ .filter(cls.group_name.ilike(group_name)) else: - gr = cls.query()\ + gr = cls.query() \ .filter(cls.group_name == group_name) if cache: gr = gr.options(FromCache( @@ -1125,8 +1125,8 @@ class RepoGroup(Base, BaseModel): @property def repositories(self): - return Repository.query()\ - .filter(Repository.group == self)\ + return Repository.query() \ + .filter(Repository.group == self) \ .order_by(Repository.repo_name) @property @@ -1243,18 +1243,18 @@ class Permission(Base, BaseModel): @classmethod def get_default_perms(cls, default_user_id): - q = Session().query(UserRepoToPerm, Repository, cls)\ - .join((Repository, UserRepoToPerm.repository_id == Repository.repo_id))\ - .join((cls, UserRepoToPerm.permission_id == cls.permission_id))\ + q = Session().query(UserRepoToPerm, Repository, cls) \ + .join((Repository, UserRepoToPerm.repository_id == Repository.repo_id)) \ + .join((cls, UserRepoToPerm.permission_id == cls.permission_id)) \ .filter(UserRepoToPerm.user_id == default_user_id) return q.all() @classmethod def get_default_group_perms(cls, default_user_id): - q = Session().query(UserRepoGroupToPerm, RepoGroup, cls)\ - .join((RepoGroup, UserRepoGroupToPerm.group_id == RepoGroup.group_id))\ - .join((cls, UserRepoGroupToPerm.permission_id == cls.permission_id))\ + q = Session().query(UserRepoGroupToPerm, RepoGroup, cls) \ + .join((RepoGroup, UserRepoGroupToPerm.group_id == RepoGroup.group_id)) \ + .join((cls, UserRepoGroupToPerm.permission_id == cls.permission_id)) \ .filter(UserRepoGroupToPerm.user_id == default_user_id) return q.all() @@ -1623,7 +1623,7 @@ class ChangesetComment(Base, BaseModel): :param cls: :param revision: """ - q = Session().query(User)\ + q = Session().query(User) \ .join(ChangesetComment.author) if revision: q = q.filter(cls.revision == revision) @@ -1780,8 +1780,8 @@ class Notification(Base, BaseModel): @property def recipients(self): - return [x.user for x in UserNotification.query()\ - .filter(UserNotification.notification == self)\ + return [x.user for x in UserNotification.query() \ + .filter(UserNotification.notification == self) \ .order_by(UserNotification.user_id.asc()).all()] @classmethod diff --git a/kallithea/lib/dbmigrate/schema/db_1_5_2.py b/kallithea/lib/dbmigrate/schema/db_1_5_2.py --- a/kallithea/lib/dbmigrate/schema/db_1_5_2.py +++ b/kallithea/lib/dbmigrate/schema/db_1_5_2.py @@ -196,7 +196,7 @@ class Setting(Base, BaseModel): @classmethod def get_by_name(cls, key): - return cls.query()\ + return cls.query() \ .filter(cls.app_settings_name == key).scalar() @classmethod @@ -225,7 +225,7 @@ class Setting(Base, BaseModel): @classmethod def get_ldap_settings(cls, cache=False): - ret = cls.query()\ + ret = cls.query() \ .filter(cls.app_settings_name.startswith('ldap_')).all() fd = {} for row in ret: @@ -235,7 +235,7 @@ class Setting(Base, BaseModel): @classmethod def get_default_repo_settings(cls, cache=False, strip_prefix=False): - ret = cls.query()\ + ret = cls.query() \ .filter(cls.app_settings_name.startswith('default_')).all() fd = {} for row in ret: @@ -757,8 +757,8 @@ class Repository(Base, BaseModel): @classmethod def get_by_repo_name(cls, repo_name): q = Session().query(cls).filter(cls.repo_name == repo_name) - q = q.options(joinedload(Repository.fork))\ - .options(joinedload(Repository.user))\ + q = q.options(joinedload(Repository.fork)) \ + .options(joinedload(Repository.user)) \ .options(joinedload(Repository.group)) return q.scalar() @@ -779,7 +779,7 @@ class Repository(Base, BaseModel): :param cls: """ - q = Session().query(Ui)\ + q = Session().query(Ui) \ .filter(Ui.ui_key == cls.url_sep()) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value @@ -848,9 +848,9 @@ class Repository(Base, BaseModel): """ Returns associated cache keys for that repo """ - return CacheInvalidation.query()\ - .filter(CacheInvalidation.cache_args == self.repo_name)\ - .order_by(CacheInvalidation.cache_key)\ + return CacheInvalidation.query() \ + .filter(CacheInvalidation.cache_args == self.repo_name) \ + .order_by(CacheInvalidation.cache_key) \ .all() def get_new_name(self, repo_name): @@ -1023,7 +1023,7 @@ class Repository(Base, BaseModel): :param revisions: filter query by revisions only """ - cmts = ChangesetComment.query()\ + cmts = ChangesetComment.query() \ .filter(ChangesetComment.repo == self) if revisions: cmts = cmts.filter(ChangesetComment.revision.in_(revisions)) @@ -1040,8 +1040,8 @@ class Repository(Base, BaseModel): :type revisions: list """ - statuses = ChangesetStatus.query()\ - .filter(ChangesetStatus.repo == self)\ + statuses = ChangesetStatus.query() \ + .filter(ChangesetStatus.repo == self) \ .filter(ChangesetStatus.version == 0) if revisions: statuses = statuses.filter(ChangesetStatus.revision.in_(revisions)) @@ -1191,10 +1191,10 @@ class RepoGroup(Base, BaseModel): @classmethod def get_by_group_name(cls, group_name, cache=False, case_insensitive=False): if case_insensitive: - gr = cls.query()\ + gr = cls.query() \ .filter(cls.group_name.ilike(group_name)) else: - gr = cls.query()\ + gr = cls.query() \ .filter(cls.group_name == group_name) if cache: gr = gr.options(FromCache( @@ -1246,8 +1246,8 @@ class RepoGroup(Base, BaseModel): @property def repositories(self): - return Repository.query()\ - .filter(Repository.group == self)\ + return Repository.query() \ + .filter(Repository.group == self) \ .order_by(Repository.repo_name) @property @@ -1356,18 +1356,18 @@ class Permission(Base, BaseModel): @classmethod def get_default_perms(cls, default_user_id): - q = Session().query(UserRepoToPerm, Repository, cls)\ - .join((Repository, UserRepoToPerm.repository_id == Repository.repo_id))\ - .join((cls, UserRepoToPerm.permission_id == cls.permission_id))\ + q = Session().query(UserRepoToPerm, Repository, cls) \ + .join((Repository, UserRepoToPerm.repository_id == Repository.repo_id)) \ + .join((cls, UserRepoToPerm.permission_id == cls.permission_id)) \ .filter(UserRepoToPerm.user_id == default_user_id) return q.all() @classmethod def get_default_group_perms(cls, default_user_id): - q = Session().query(UserRepoGroupToPerm, RepoGroup, cls)\ - .join((RepoGroup, UserRepoGroupToPerm.group_id == RepoGroup.group_id))\ - .join((cls, UserRepoGroupToPerm.permission_id == cls.permission_id))\ + q = Session().query(UserRepoGroupToPerm, RepoGroup, cls) \ + .join((RepoGroup, UserRepoGroupToPerm.group_id == RepoGroup.group_id)) \ + .join((cls, UserRepoGroupToPerm.permission_id == cls.permission_id)) \ .filter(UserRepoGroupToPerm.user_id == default_user_id) return q.all() @@ -1736,7 +1736,7 @@ class ChangesetComment(Base, BaseModel): :param cls: :param revision: """ - q = Session().query(User)\ + q = Session().query(User) \ .join(ChangesetComment.author) if revision: q = q.filter(cls.revision == revision) @@ -1901,8 +1901,8 @@ class Notification(Base, BaseModel): @property def recipients(self): - return [x.user for x in UserNotification.query()\ - .filter(UserNotification.notification == self)\ + return [x.user for x in UserNotification.query() \ + .filter(UserNotification.notification == self) \ .order_by(UserNotification.user_id.asc()).all()] @classmethod diff --git a/kallithea/lib/dbmigrate/schema/db_1_6_0.py b/kallithea/lib/dbmigrate/schema/db_1_6_0.py --- a/kallithea/lib/dbmigrate/schema/db_1_6_0.py +++ b/kallithea/lib/dbmigrate/schema/db_1_6_0.py @@ -196,7 +196,7 @@ class Setting(Base, BaseModel): @classmethod def get_by_name(cls, key): - return cls.query()\ + return cls.query() \ .filter(cls.app_settings_name == key).scalar() @classmethod @@ -225,7 +225,7 @@ class Setting(Base, BaseModel): @classmethod def get_ldap_settings(cls, cache=False): - ret = cls.query()\ + ret = cls.query() \ .filter(cls.app_settings_name.startswith('ldap_')).all() fd = {} for row in ret: @@ -235,7 +235,7 @@ class Setting(Base, BaseModel): @classmethod def get_default_repo_settings(cls, cache=False, strip_prefix=False): - ret = cls.query()\ + ret = cls.query() \ .filter(cls.app_settings_name.startswith('default_')).all() fd = {} for row in ret: @@ -713,8 +713,8 @@ class RepositoryField(Base, BaseModel): @classmethod def get_by_key_name(cls, key, repo): - row = cls.query()\ - .filter(cls.repository == repo)\ + row = cls.query() \ + .filter(cls.repository == repo) \ .filter(cls.field_key == key).scalar() return row @@ -826,8 +826,8 @@ class Repository(Base, BaseModel): @classmethod def get_by_repo_name(cls, repo_name): q = Session().query(cls).filter(cls.repo_name == repo_name) - q = q.options(joinedload(Repository.fork))\ - .options(joinedload(Repository.user))\ + q = q.options(joinedload(Repository.fork)) \ + .options(joinedload(Repository.user)) \ .options(joinedload(Repository.group)) return q.scalar() @@ -848,7 +848,7 @@ class Repository(Base, BaseModel): :param cls: """ - q = Session().query(Ui)\ + q = Session().query(Ui) \ .filter(Ui.ui_key == cls.url_sep()) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value @@ -917,9 +917,9 @@ class Repository(Base, BaseModel): """ Returns associated cache keys for that repo """ - return CacheInvalidation.query()\ - .filter(CacheInvalidation.cache_args == self.repo_name)\ - .order_by(CacheInvalidation.cache_key)\ + return CacheInvalidation.query() \ + .filter(CacheInvalidation.cache_args == self.repo_name) \ + .order_by(CacheInvalidation.cache_key) \ .all() def get_new_name(self, repo_name): @@ -1093,7 +1093,7 @@ class Repository(Base, BaseModel): :param revisions: filter query by revisions only """ - cmts = ChangesetComment.query()\ + cmts = ChangesetComment.query() \ .filter(ChangesetComment.repo == self) if revisions: cmts = cmts.filter(ChangesetComment.revision.in_(revisions)) @@ -1110,8 +1110,8 @@ class Repository(Base, BaseModel): :type revisions: list """ - statuses = ChangesetStatus.query()\ - .filter(ChangesetStatus.repo == self)\ + statuses = ChangesetStatus.query() \ + .filter(ChangesetStatus.repo == self) \ .filter(ChangesetStatus.version == 0) if revisions: statuses = statuses.filter(ChangesetStatus.revision.in_(revisions)) @@ -1266,10 +1266,10 @@ class RepoGroup(Base, BaseModel): @classmethod def get_by_group_name(cls, group_name, cache=False, case_insensitive=False): if case_insensitive: - gr = cls.query()\ + gr = cls.query() \ .filter(cls.group_name.ilike(group_name)) else: - gr = cls.query()\ + gr = cls.query() \ .filter(cls.group_name == group_name) if cache: gr = gr.options(FromCache( @@ -1321,8 +1321,8 @@ class RepoGroup(Base, BaseModel): @property def repositories(self): - return Repository.query()\ - .filter(Repository.group == self)\ + return Repository.query() \ + .filter(Repository.group == self) \ .order_by(Repository.repo_name) @property @@ -1441,18 +1441,18 @@ class Permission(Base, BaseModel): @classmethod def get_default_perms(cls, default_user_id): - q = Session().query(UserRepoToPerm, Repository, cls)\ - .join((Repository, UserRepoToPerm.repository_id == Repository.repo_id))\ - .join((cls, UserRepoToPerm.permission_id == cls.permission_id))\ + q = Session().query(UserRepoToPerm, Repository, cls) \ + .join((Repository, UserRepoToPerm.repository_id == Repository.repo_id)) \ + .join((cls, UserRepoToPerm.permission_id == cls.permission_id)) \ .filter(UserRepoToPerm.user_id == default_user_id) return q.all() @classmethod def get_default_group_perms(cls, default_user_id): - q = Session().query(UserRepoGroupToPerm, RepoGroup, cls)\ - .join((RepoGroup, UserRepoGroupToPerm.group_id == RepoGroup.group_id))\ - .join((cls, UserRepoGroupToPerm.permission_id == cls.permission_id))\ + q = Session().query(UserRepoGroupToPerm, RepoGroup, cls) \ + .join((RepoGroup, UserRepoGroupToPerm.group_id == RepoGroup.group_id)) \ + .join((cls, UserRepoGroupToPerm.permission_id == cls.permission_id)) \ .filter(UserRepoGroupToPerm.user_id == default_user_id) return q.all() @@ -1811,7 +1811,7 @@ class ChangesetComment(Base, BaseModel): :param cls: :param revision: """ - q = Session().query(User)\ + q = Session().query(User) \ .join(ChangesetComment.author) if revision: q = q.filter(cls.revision == revision) @@ -1980,8 +1980,8 @@ class Notification(Base, BaseModel): @property def recipients(self): - return [x.user for x in UserNotification.query()\ - .filter(UserNotification.notification == self)\ + return [x.user for x in UserNotification.query() \ + .filter(UserNotification.notification == self) \ .order_by(UserNotification.user_id.asc()).all()] @classmethod diff --git a/kallithea/lib/dbmigrate/schema/db_1_7_0.py b/kallithea/lib/dbmigrate/schema/db_1_7_0.py --- a/kallithea/lib/dbmigrate/schema/db_1_7_0.py +++ b/kallithea/lib/dbmigrate/schema/db_1_7_0.py @@ -201,7 +201,7 @@ class Setting(Base, BaseModel): @classmethod def get_by_name(cls, key): - return cls.query()\ + return cls.query() \ .filter(cls.app_settings_name == key).scalar() @classmethod @@ -230,7 +230,7 @@ class Setting(Base, BaseModel): @classmethod def get_ldap_settings(cls, cache=False): - ret = cls.query()\ + ret = cls.query() \ .filter(cls.app_settings_name.startswith('ldap_')).all() fd = {} for row in ret: @@ -240,7 +240,7 @@ class Setting(Base, BaseModel): @classmethod def get_default_repo_settings(cls, cache=False, strip_prefix=False): - ret = cls.query()\ + ret = cls.query() \ .filter(cls.app_settings_name.startswith('default_')).all() fd = {} for row in ret: @@ -742,8 +742,8 @@ class RepositoryField(Base, BaseModel): @classmethod def get_by_key_name(cls, key, repo): - row = cls.query()\ - .filter(cls.repository == repo)\ + row = cls.query() \ + .filter(cls.repository == repo) \ .filter(cls.field_key == key).scalar() return row @@ -855,8 +855,8 @@ class Repository(Base, BaseModel): @classmethod def get_by_repo_name(cls, repo_name): q = Session().query(cls).filter(cls.repo_name == repo_name) - q = q.options(joinedload(Repository.fork))\ - .options(joinedload(Repository.user))\ + q = q.options(joinedload(Repository.fork)) \ + .options(joinedload(Repository.user)) \ .options(joinedload(Repository.group)) return q.scalar() @@ -877,7 +877,7 @@ class Repository(Base, BaseModel): :param cls: """ - q = Session().query(Ui)\ + q = Session().query(Ui) \ .filter(Ui.ui_key == cls.url_sep()) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value @@ -946,9 +946,9 @@ class Repository(Base, BaseModel): """ Returns associated cache keys for that repo """ - return CacheInvalidation.query()\ - .filter(CacheInvalidation.cache_args == self.repo_name)\ - .order_by(CacheInvalidation.cache_key)\ + return CacheInvalidation.query() \ + .filter(CacheInvalidation.cache_args == self.repo_name) \ + .order_by(CacheInvalidation.cache_key) \ .all() def get_new_name(self, repo_name): @@ -1124,7 +1124,7 @@ class Repository(Base, BaseModel): :param revisions: filter query by revisions only """ - cmts = ChangesetComment.query()\ + cmts = ChangesetComment.query() \ .filter(ChangesetComment.repo == self) if revisions: cmts = cmts.filter(ChangesetComment.revision.in_(revisions)) @@ -1140,8 +1140,8 @@ class Repository(Base, BaseModel): :param revisions: list of revisions to get statuses for """ - statuses = ChangesetStatus.query()\ - .filter(ChangesetStatus.repo == self)\ + statuses = ChangesetStatus.query() \ + .filter(ChangesetStatus.repo == self) \ .filter(ChangesetStatus.version == 0) if revisions: statuses = statuses.filter(ChangesetStatus.revision.in_(revisions)) @@ -1284,10 +1284,10 @@ class RepoGroup(Base, BaseModel): @classmethod def get_by_group_name(cls, group_name, cache=False, case_insensitive=False): if case_insensitive: - gr = cls.query()\ + gr = cls.query() \ .filter(cls.group_name.ilike(group_name)) else: - gr = cls.query()\ + gr = cls.query() \ .filter(cls.group_name == group_name) if cache: gr = gr.options(FromCache( @@ -1339,8 +1339,8 @@ class RepoGroup(Base, BaseModel): @property def repositories(self): - return Repository.query()\ - .filter(Repository.group == self)\ + return Repository.query() \ + .filter(Repository.group == self) \ .order_by(Repository.repo_name) @property @@ -1497,27 +1497,27 @@ class Permission(Base, BaseModel): @classmethod def get_default_perms(cls, default_user_id): - q = Session().query(UserRepoToPerm, Repository, cls)\ - .join((Repository, UserRepoToPerm.repository_id == Repository.repo_id))\ - .join((cls, UserRepoToPerm.permission_id == cls.permission_id))\ + q = Session().query(UserRepoToPerm, Repository, cls) \ + .join((Repository, UserRepoToPerm.repository_id == Repository.repo_id)) \ + .join((cls, UserRepoToPerm.permission_id == cls.permission_id)) \ .filter(UserRepoToPerm.user_id == default_user_id) return q.all() @classmethod def get_default_group_perms(cls, default_user_id): - q = Session().query(UserRepoGroupToPerm, RepoGroup, cls)\ - .join((RepoGroup, UserRepoGroupToPerm.group_id == RepoGroup.group_id))\ - .join((cls, UserRepoGroupToPerm.permission_id == cls.permission_id))\ + q = Session().query(UserRepoGroupToPerm, RepoGroup, cls) \ + .join((RepoGroup, UserRepoGroupToPerm.group_id == RepoGroup.group_id)) \ + .join((cls, UserRepoGroupToPerm.permission_id == cls.permission_id)) \ .filter(UserRepoGroupToPerm.user_id == default_user_id) return q.all() @classmethod def get_default_user_group_perms(cls, default_user_id): - q = Session().query(UserUserGroupToPerm, UserGroup, cls)\ - .join((UserGroup, UserUserGroupToPerm.user_group_id == UserGroup.users_group_id))\ - .join((cls, UserUserGroupToPerm.permission_id == cls.permission_id))\ + q = Session().query(UserUserGroupToPerm, UserGroup, cls) \ + .join((UserGroup, UserUserGroupToPerm.user_group_id == UserGroup.users_group_id)) \ + .join((cls, UserUserGroupToPerm.permission_id == cls.permission_id)) \ .filter(UserUserGroupToPerm.user_id == default_user_id) return q.all() @@ -1907,7 +1907,7 @@ class ChangesetComment(Base, BaseModel): :param cls: :param revision: """ - q = Session().query(User)\ + q = Session().query(User) \ .join(ChangesetComment.author) if revision: q = q.filter(cls.revision == revision) @@ -2076,8 +2076,8 @@ class Notification(Base, BaseModel): @property def recipients(self): - return [x.user for x in UserNotification.query()\ - .filter(UserNotification.notification == self)\ + return [x.user for x in UserNotification.query() \ + .filter(UserNotification.notification == self) \ .order_by(UserNotification.user_id.asc()).all()] @classmethod @@ -2176,7 +2176,7 @@ class Gist(Base, BaseModel): :param cls: """ from kallithea.model.gist import GIST_STORE_LOC - q = Session().query(Ui)\ + q = Session().query(Ui) \ .filter(Ui.ui_key == URL_SEP) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return os.path.join(q.one().ui_value, GIST_STORE_LOC) diff --git a/kallithea/lib/dbmigrate/schema/db_1_8_0.py b/kallithea/lib/dbmigrate/schema/db_1_8_0.py --- a/kallithea/lib/dbmigrate/schema/db_1_8_0.py +++ b/kallithea/lib/dbmigrate/schema/db_1_8_0.py @@ -203,7 +203,7 @@ class Setting(Base, BaseModel): @classmethod def get_by_name(cls, key): - return cls.query()\ + return cls.query() \ .filter(cls.app_settings_name == key).scalar() @classmethod @@ -232,7 +232,7 @@ class Setting(Base, BaseModel): @classmethod def get_ldap_settings(cls, cache=False): - ret = cls.query()\ + ret = cls.query() \ .filter(cls.app_settings_name.startswith('ldap_')).all() fd = {} for row in ret: @@ -242,7 +242,7 @@ class Setting(Base, BaseModel): @classmethod def get_default_repo_settings(cls, cache=False, strip_prefix=False): - ret = cls.query()\ + ret = cls.query() \ .filter(cls.app_settings_name.startswith('default_')).all() fd = {} for row in ret: @@ -772,8 +772,8 @@ class RepositoryField(Base, BaseModel): @classmethod def get_by_key_name(cls, key, repo): - row = cls.query()\ - .filter(cls.repository == repo)\ + row = cls.query() \ + .filter(cls.repository == repo) \ .filter(cls.field_key == key).scalar() return row @@ -885,8 +885,8 @@ class Repository(Base, BaseModel): @classmethod def get_by_repo_name(cls, repo_name): q = Session().query(cls).filter(cls.repo_name == repo_name) - q = q.options(joinedload(Repository.fork))\ - .options(joinedload(Repository.user))\ + q = q.options(joinedload(Repository.fork)) \ + .options(joinedload(Repository.user)) \ .options(joinedload(Repository.group)) return q.scalar() @@ -907,7 +907,7 @@ class Repository(Base, BaseModel): :param cls: """ - q = Session().query(Ui)\ + q = Session().query(Ui) \ .filter(Ui.ui_key == cls.url_sep()) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value @@ -976,9 +976,9 @@ class Repository(Base, BaseModel): """ Returns associated cache keys for that repo """ - return CacheInvalidation.query()\ - .filter(CacheInvalidation.cache_args == self.repo_name)\ - .order_by(CacheInvalidation.cache_key)\ + return CacheInvalidation.query() \ + .filter(CacheInvalidation.cache_args == self.repo_name) \ + .order_by(CacheInvalidation.cache_key) \ .all() def get_new_name(self, repo_name): @@ -1154,7 +1154,7 @@ class Repository(Base, BaseModel): :param revisions: filter query by revisions only """ - cmts = ChangesetComment.query()\ + cmts = ChangesetComment.query() \ .filter(ChangesetComment.repo == self) if revisions: cmts = cmts.filter(ChangesetComment.revision.in_(revisions)) @@ -1170,8 +1170,8 @@ class Repository(Base, BaseModel): :param revisions: list of revisions to get statuses for """ - statuses = ChangesetStatus.query()\ - .filter(ChangesetStatus.repo == self)\ + statuses = ChangesetStatus.query() \ + .filter(ChangesetStatus.repo == self) \ .filter(ChangesetStatus.version == 0) if revisions: statuses = statuses.filter(ChangesetStatus.revision.in_(revisions)) @@ -1314,10 +1314,10 @@ class RepoGroup(Base, BaseModel): @classmethod def get_by_group_name(cls, group_name, cache=False, case_insensitive=False): if case_insensitive: - gr = cls.query()\ + gr = cls.query() \ .filter(cls.group_name.ilike(group_name)) else: - gr = cls.query()\ + gr = cls.query() \ .filter(cls.group_name == group_name) if cache: gr = gr.options(FromCache( @@ -1369,8 +1369,8 @@ class RepoGroup(Base, BaseModel): @property def repositories(self): - return Repository.query()\ - .filter(Repository.group == self)\ + return Repository.query() \ + .filter(Repository.group == self) \ .order_by(Repository.repo_name) @property @@ -1543,27 +1543,27 @@ class Permission(Base, BaseModel): @classmethod def get_default_perms(cls, default_user_id): - q = Session().query(UserRepoToPerm, Repository, cls)\ - .join((Repository, UserRepoToPerm.repository_id == Repository.repo_id))\ - .join((cls, UserRepoToPerm.permission_id == cls.permission_id))\ + q = Session().query(UserRepoToPerm, Repository, cls) \ + .join((Repository, UserRepoToPerm.repository_id == Repository.repo_id)) \ + .join((cls, UserRepoToPerm.permission_id == cls.permission_id)) \ .filter(UserRepoToPerm.user_id == default_user_id) return q.all() @classmethod def get_default_group_perms(cls, default_user_id): - q = Session().query(UserRepoGroupToPerm, RepoGroup, cls)\ - .join((RepoGroup, UserRepoGroupToPerm.group_id == RepoGroup.group_id))\ - .join((cls, UserRepoGroupToPerm.permission_id == cls.permission_id))\ + q = Session().query(UserRepoGroupToPerm, RepoGroup, cls) \ + .join((RepoGroup, UserRepoGroupToPerm.group_id == RepoGroup.group_id)) \ + .join((cls, UserRepoGroupToPerm.permission_id == cls.permission_id)) \ .filter(UserRepoGroupToPerm.user_id == default_user_id) return q.all() @classmethod def get_default_user_group_perms(cls, default_user_id): - q = Session().query(UserUserGroupToPerm, UserGroup, cls)\ - .join((UserGroup, UserUserGroupToPerm.user_group_id == UserGroup.users_group_id))\ - .join((cls, UserUserGroupToPerm.permission_id == cls.permission_id))\ + q = Session().query(UserUserGroupToPerm, UserGroup, cls) \ + .join((UserGroup, UserUserGroupToPerm.user_group_id == UserGroup.users_group_id)) \ + .join((cls, UserUserGroupToPerm.permission_id == cls.permission_id)) \ .filter(UserUserGroupToPerm.user_id == default_user_id) return q.all() @@ -1953,7 +1953,7 @@ class ChangesetComment(Base, BaseModel): :param cls: :param revision: """ - q = Session().query(User)\ + q = Session().query(User) \ .join(ChangesetComment.author) if revision: q = q.filter(cls.revision == revision) @@ -2123,8 +2123,8 @@ class Notification(Base, BaseModel): @property def recipients(self): - return [x.user for x in UserNotification.query()\ - .filter(UserNotification.notification == self)\ + return [x.user for x in UserNotification.query() \ + .filter(UserNotification.notification == self) \ .order_by(UserNotification.user_id.asc()).all()] @classmethod @@ -2223,7 +2223,7 @@ class Gist(Base, BaseModel): :param cls: """ from kallithea.model.gist import GIST_STORE_LOC - q = Session().query(Ui)\ + q = Session().query(Ui) \ .filter(Ui.ui_key == URL_SEP) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return os.path.join(q.one().ui_value, GIST_STORE_LOC) diff --git a/kallithea/lib/dbmigrate/schema/db_2_0_0.py b/kallithea/lib/dbmigrate/schema/db_2_0_0.py --- a/kallithea/lib/dbmigrate/schema/db_2_0_0.py +++ b/kallithea/lib/dbmigrate/schema/db_2_0_0.py @@ -218,7 +218,7 @@ class Setting(Base, BaseModel): @classmethod def get_by_name(cls, key): - return cls.query()\ + return cls.query() \ .filter(cls.app_settings_name == key).scalar() @classmethod @@ -278,7 +278,7 @@ class Setting(Base, BaseModel): @classmethod def get_auth_settings(cls, cache=False): - ret = cls.query()\ + ret = cls.query() \ .filter(cls.app_settings_name.startswith('auth_')).all() fd = {} for row in ret: @@ -288,7 +288,7 @@ class Setting(Base, BaseModel): @classmethod def get_default_repo_settings(cls, cache=False, strip_prefix=False): - ret = cls.query()\ + ret = cls.query() \ .filter(cls.app_settings_name.startswith('default_')).all() fd = {} for row in ret: @@ -829,8 +829,8 @@ class RepositoryField(Base, BaseModel): @classmethod def get_by_key_name(cls, key, repo): - row = cls.query()\ - .filter(cls.repository == repo)\ + row = cls.query() \ + .filter(cls.repository == repo) \ .filter(cls.field_key == key).scalar() return row @@ -942,8 +942,8 @@ class Repository(Base, BaseModel): @classmethod def get_by_repo_name(cls, repo_name): q = Session().query(cls).filter(cls.repo_name == repo_name) - q = q.options(joinedload(Repository.fork))\ - .options(joinedload(Repository.user))\ + q = q.options(joinedload(Repository.fork)) \ + .options(joinedload(Repository.user)) \ .options(joinedload(Repository.group)) return q.scalar() @@ -964,7 +964,7 @@ class Repository(Base, BaseModel): :param cls: """ - q = Session().query(Ui)\ + q = Session().query(Ui) \ .filter(Ui.ui_key == cls.url_sep()) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value @@ -1033,9 +1033,9 @@ class Repository(Base, BaseModel): """ Returns associated cache keys for that repo """ - return CacheInvalidation.query()\ - .filter(CacheInvalidation.cache_args == self.repo_name)\ - .order_by(CacheInvalidation.cache_key)\ + return CacheInvalidation.query() \ + .filter(CacheInvalidation.cache_args == self.repo_name) \ + .order_by(CacheInvalidation.cache_key) \ .all() def get_new_name(self, repo_name): @@ -1211,7 +1211,7 @@ class Repository(Base, BaseModel): :param revisions: filter query by revisions only """ - cmts = ChangesetComment.query()\ + cmts = ChangesetComment.query() \ .filter(ChangesetComment.repo == self) if revisions: cmts = cmts.filter(ChangesetComment.revision.in_(revisions)) @@ -1227,8 +1227,8 @@ class Repository(Base, BaseModel): :param revisions: list of revisions to get statuses for """ - statuses = ChangesetStatus.query()\ - .filter(ChangesetStatus.repo == self)\ + statuses = ChangesetStatus.query() \ + .filter(ChangesetStatus.repo == self) \ .filter(ChangesetStatus.version == 0) if revisions: statuses = statuses.filter(ChangesetStatus.revision.in_(revisions)) @@ -1371,10 +1371,10 @@ class RepoGroup(Base, BaseModel): @classmethod def get_by_group_name(cls, group_name, cache=False, case_insensitive=False): if case_insensitive: - gr = cls.query()\ + gr = cls.query() \ .filter(cls.group_name.ilike(group_name)) else: - gr = cls.query()\ + gr = cls.query() \ .filter(cls.group_name == group_name) if cache: gr = gr.options(FromCache( @@ -1426,8 +1426,8 @@ class RepoGroup(Base, BaseModel): @property def repositories(self): - return Repository.query()\ - .filter(Repository.group == self)\ + return Repository.query() \ + .filter(Repository.group == self) \ .order_by(Repository.repo_name) @property @@ -1600,27 +1600,27 @@ class Permission(Base, BaseModel): @classmethod def get_default_perms(cls, default_user_id): - q = Session().query(UserRepoToPerm, Repository, cls)\ - .join((Repository, UserRepoToPerm.repository_id == Repository.repo_id))\ - .join((cls, UserRepoToPerm.permission_id == cls.permission_id))\ + q = Session().query(UserRepoToPerm, Repository, cls) \ + .join((Repository, UserRepoToPerm.repository_id == Repository.repo_id)) \ + .join((cls, UserRepoToPerm.permission_id == cls.permission_id)) \ .filter(UserRepoToPerm.user_id == default_user_id) return q.all() @classmethod def get_default_group_perms(cls, default_user_id): - q = Session().query(UserRepoGroupToPerm, RepoGroup, cls)\ - .join((RepoGroup, UserRepoGroupToPerm.group_id == RepoGroup.group_id))\ - .join((cls, UserRepoGroupToPerm.permission_id == cls.permission_id))\ + q = Session().query(UserRepoGroupToPerm, RepoGroup, cls) \ + .join((RepoGroup, UserRepoGroupToPerm.group_id == RepoGroup.group_id)) \ + .join((cls, UserRepoGroupToPerm.permission_id == cls.permission_id)) \ .filter(UserRepoGroupToPerm.user_id == default_user_id) return q.all() @classmethod def get_default_user_group_perms(cls, default_user_id): - q = Session().query(UserUserGroupToPerm, UserGroup, cls)\ - .join((UserGroup, UserUserGroupToPerm.user_group_id == UserGroup.users_group_id))\ - .join((cls, UserUserGroupToPerm.permission_id == cls.permission_id))\ + q = Session().query(UserUserGroupToPerm, UserGroup, cls) \ + .join((UserGroup, UserUserGroupToPerm.user_group_id == UserGroup.users_group_id)) \ + .join((cls, UserUserGroupToPerm.permission_id == cls.permission_id)) \ .filter(UserUserGroupToPerm.user_id == default_user_id) return q.all() @@ -2013,7 +2013,7 @@ class ChangesetComment(Base, BaseModel): :param cls: :param revision: """ - q = Session().query(User)\ + q = Session().query(User) \ .join(ChangesetComment.author) if revision: q = q.filter(cls.revision == revision) @@ -2183,8 +2183,8 @@ class Notification(Base, BaseModel): @property def recipients(self): - return [x.user for x in UserNotification.query()\ - .filter(UserNotification.notification == self)\ + return [x.user for x in UserNotification.query() \ + .filter(UserNotification.notification == self) \ .order_by(UserNotification.user_id.asc()).all()] @classmethod @@ -2283,7 +2283,7 @@ class Gist(Base, BaseModel): :param cls: """ from kallithea.model.gist import GIST_STORE_LOC - q = Session().query(Ui)\ + q = Session().query(Ui) \ .filter(Ui.ui_key == URL_SEP) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return os.path.join(q.one().ui_value, GIST_STORE_LOC) diff --git a/kallithea/lib/dbmigrate/schema/db_2_0_1.py b/kallithea/lib/dbmigrate/schema/db_2_0_1.py --- a/kallithea/lib/dbmigrate/schema/db_2_0_1.py +++ b/kallithea/lib/dbmigrate/schema/db_2_0_1.py @@ -221,7 +221,7 @@ class Setting(Base, BaseModel): @classmethod def get_by_name(cls, key): - return cls.query()\ + return cls.query() \ .filter(cls.app_settings_name == key).scalar() @classmethod @@ -281,7 +281,7 @@ class Setting(Base, BaseModel): @classmethod def get_auth_settings(cls, cache=False): - ret = cls.query()\ + ret = cls.query() \ .filter(cls.app_settings_name.startswith('auth_')).all() fd = {} for row in ret: @@ -291,7 +291,7 @@ class Setting(Base, BaseModel): @classmethod def get_default_repo_settings(cls, cache=False, strip_prefix=False): - ret = cls.query()\ + ret = cls.query() \ .filter(cls.app_settings_name.startswith('default_')).all() fd = {} for row in ret: @@ -828,8 +828,8 @@ class RepositoryField(Base, BaseModel): @classmethod def get_by_key_name(cls, key, repo): - row = cls.query()\ - .filter(cls.repository == repo)\ + row = cls.query() \ + .filter(cls.repository == repo) \ .filter(cls.field_key == key).scalar() return row @@ -941,8 +941,8 @@ class Repository(Base, BaseModel): @classmethod def get_by_repo_name(cls, repo_name): q = Session().query(cls).filter(cls.repo_name == repo_name) - q = q.options(joinedload(Repository.fork))\ - .options(joinedload(Repository.user))\ + q = q.options(joinedload(Repository.fork)) \ + .options(joinedload(Repository.user)) \ .options(joinedload(Repository.group)) return q.scalar() @@ -963,7 +963,7 @@ class Repository(Base, BaseModel): :param cls: """ - q = Session().query(Ui)\ + q = Session().query(Ui) \ .filter(Ui.ui_key == cls.url_sep()) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value @@ -1032,9 +1032,9 @@ class Repository(Base, BaseModel): """ Returns associated cache keys for that repo """ - return CacheInvalidation.query()\ - .filter(CacheInvalidation.cache_args == self.repo_name)\ - .order_by(CacheInvalidation.cache_key)\ + return CacheInvalidation.query() \ + .filter(CacheInvalidation.cache_args == self.repo_name) \ + .order_by(CacheInvalidation.cache_key) \ .all() def get_new_name(self, repo_name): @@ -1210,7 +1210,7 @@ class Repository(Base, BaseModel): :param revisions: filter query by revisions only """ - cmts = ChangesetComment.query()\ + cmts = ChangesetComment.query() \ .filter(ChangesetComment.repo == self) if revisions: cmts = cmts.filter(ChangesetComment.revision.in_(revisions)) @@ -1226,8 +1226,8 @@ class Repository(Base, BaseModel): :param revisions: list of revisions to get statuses for """ - statuses = ChangesetStatus.query()\ - .filter(ChangesetStatus.repo == self)\ + statuses = ChangesetStatus.query() \ + .filter(ChangesetStatus.repo == self) \ .filter(ChangesetStatus.version == 0) if revisions: statuses = statuses.filter(ChangesetStatus.revision.in_(revisions)) @@ -1372,10 +1372,10 @@ class RepoGroup(Base, BaseModel): @classmethod def get_by_group_name(cls, group_name, cache=False, case_insensitive=False): if case_insensitive: - gr = cls.query()\ + gr = cls.query() \ .filter(cls.group_name.ilike(group_name)) else: - gr = cls.query()\ + gr = cls.query() \ .filter(cls.group_name == group_name) if cache: gr = gr.options(FromCache( @@ -1427,8 +1427,8 @@ class RepoGroup(Base, BaseModel): @property def repositories(self): - return Repository.query()\ - .filter(Repository.group == self)\ + return Repository.query() \ + .filter(Repository.group == self) \ .order_by(Repository.repo_name) @property @@ -1601,27 +1601,27 @@ class Permission(Base, BaseModel): @classmethod def get_default_perms(cls, default_user_id): - q = Session().query(UserRepoToPerm, Repository, cls)\ - .join((Repository, UserRepoToPerm.repository_id == Repository.repo_id))\ - .join((cls, UserRepoToPerm.permission_id == cls.permission_id))\ + q = Session().query(UserRepoToPerm, Repository, cls) \ + .join((Repository, UserRepoToPerm.repository_id == Repository.repo_id)) \ + .join((cls, UserRepoToPerm.permission_id == cls.permission_id)) \ .filter(UserRepoToPerm.user_id == default_user_id) return q.all() @classmethod def get_default_group_perms(cls, default_user_id): - q = Session().query(UserRepoGroupToPerm, RepoGroup, cls)\ - .join((RepoGroup, UserRepoGroupToPerm.group_id == RepoGroup.group_id))\ - .join((cls, UserRepoGroupToPerm.permission_id == cls.permission_id))\ + q = Session().query(UserRepoGroupToPerm, RepoGroup, cls) \ + .join((RepoGroup, UserRepoGroupToPerm.group_id == RepoGroup.group_id)) \ + .join((cls, UserRepoGroupToPerm.permission_id == cls.permission_id)) \ .filter(UserRepoGroupToPerm.user_id == default_user_id) return q.all() @classmethod def get_default_user_group_perms(cls, default_user_id): - q = Session().query(UserUserGroupToPerm, UserGroup, cls)\ - .join((UserGroup, UserUserGroupToPerm.user_group_id == UserGroup.users_group_id))\ - .join((cls, UserUserGroupToPerm.permission_id == cls.permission_id))\ + q = Session().query(UserUserGroupToPerm, UserGroup, cls) \ + .join((UserGroup, UserUserGroupToPerm.user_group_id == UserGroup.users_group_id)) \ + .join((cls, UserUserGroupToPerm.permission_id == cls.permission_id)) \ .filter(UserUserGroupToPerm.user_id == default_user_id) return q.all() @@ -2014,7 +2014,7 @@ class ChangesetComment(Base, BaseModel): :param cls: :param revision: """ - q = Session().query(User)\ + q = Session().query(User) \ .join(ChangesetComment.author) if revision: q = q.filter(cls.revision == revision) @@ -2184,8 +2184,8 @@ class Notification(Base, BaseModel): @property def recipients(self): - return [x.user for x in UserNotification.query()\ - .filter(UserNotification.notification == self)\ + return [x.user for x in UserNotification.query() \ + .filter(UserNotification.notification == self) \ .order_by(UserNotification.user_id.asc()).all()] @classmethod @@ -2284,7 +2284,7 @@ class Gist(Base, BaseModel): :param cls: """ from kallithea.model.gist import GIST_STORE_LOC - q = Session().query(Ui)\ + q = Session().query(Ui) \ .filter(Ui.ui_key == URL_SEP) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return os.path.join(q.one().ui_value, GIST_STORE_LOC) diff --git a/kallithea/lib/dbmigrate/schema/db_2_0_2.py b/kallithea/lib/dbmigrate/schema/db_2_0_2.py --- a/kallithea/lib/dbmigrate/schema/db_2_0_2.py +++ b/kallithea/lib/dbmigrate/schema/db_2_0_2.py @@ -221,7 +221,7 @@ class Setting(Base, BaseModel): @classmethod def get_by_name(cls, key): - return cls.query()\ + return cls.query() \ .filter(cls.app_settings_name == key).scalar() @classmethod @@ -281,7 +281,7 @@ class Setting(Base, BaseModel): @classmethod def get_auth_settings(cls, cache=False): - ret = cls.query()\ + ret = cls.query() \ .filter(cls.app_settings_name.startswith('auth_')).all() fd = {} for row in ret: @@ -291,7 +291,7 @@ class Setting(Base, BaseModel): @classmethod def get_default_repo_settings(cls, cache=False, strip_prefix=False): - ret = cls.query()\ + ret = cls.query() \ .filter(cls.app_settings_name.startswith('default_')).all() fd = {} for row in ret: @@ -828,8 +828,8 @@ class RepositoryField(Base, BaseModel): @classmethod def get_by_key_name(cls, key, repo): - row = cls.query()\ - .filter(cls.repository == repo)\ + row = cls.query() \ + .filter(cls.repository == repo) \ .filter(cls.field_key == key).scalar() return row @@ -958,8 +958,8 @@ class Repository(Base, BaseModel): @classmethod def get_by_repo_name(cls, repo_name): q = Session().query(cls).filter(cls.repo_name == repo_name) - q = q.options(joinedload(Repository.fork))\ - .options(joinedload(Repository.user))\ + q = q.options(joinedload(Repository.fork)) \ + .options(joinedload(Repository.user)) \ .options(joinedload(Repository.group)) return q.scalar() @@ -980,7 +980,7 @@ class Repository(Base, BaseModel): :param cls: """ - q = Session().query(Ui)\ + q = Session().query(Ui) \ .filter(Ui.ui_key == cls.url_sep()) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value @@ -1049,9 +1049,9 @@ class Repository(Base, BaseModel): """ Returns associated cache keys for that repo """ - return CacheInvalidation.query()\ - .filter(CacheInvalidation.cache_args == self.repo_name)\ - .order_by(CacheInvalidation.cache_key)\ + return CacheInvalidation.query() \ + .filter(CacheInvalidation.cache_args == self.repo_name) \ + .order_by(CacheInvalidation.cache_key) \ .all() def get_new_name(self, repo_name): @@ -1230,7 +1230,7 @@ class Repository(Base, BaseModel): :param revisions: filter query by revisions only """ - cmts = ChangesetComment.query()\ + cmts = ChangesetComment.query() \ .filter(ChangesetComment.repo == self) if revisions: cmts = cmts.filter(ChangesetComment.revision.in_(revisions)) @@ -1246,8 +1246,8 @@ class Repository(Base, BaseModel): :param revisions: list of revisions to get statuses for """ - statuses = ChangesetStatus.query()\ - .filter(ChangesetStatus.repo == self)\ + statuses = ChangesetStatus.query() \ + .filter(ChangesetStatus.repo == self) \ .filter(ChangesetStatus.version == 0) if revisions: statuses = statuses.filter(ChangesetStatus.revision.in_(revisions)) @@ -1393,10 +1393,10 @@ class RepoGroup(Base, BaseModel): @classmethod def get_by_group_name(cls, group_name, cache=False, case_insensitive=False): if case_insensitive: - gr = cls.query()\ + gr = cls.query() \ .filter(cls.group_name.ilike(group_name)) else: - gr = cls.query()\ + gr = cls.query() \ .filter(cls.group_name == group_name) if cache: gr = gr.options(FromCache( @@ -1448,8 +1448,8 @@ class RepoGroup(Base, BaseModel): @property def repositories(self): - return Repository.query()\ - .filter(Repository.group == self)\ + return Repository.query() \ + .filter(Repository.group == self) \ .order_by(Repository.repo_name) @property @@ -1622,27 +1622,27 @@ class Permission(Base, BaseModel): @classmethod def get_default_perms(cls, default_user_id): - q = Session().query(UserRepoToPerm, Repository, cls)\ - .join((Repository, UserRepoToPerm.repository_id == Repository.repo_id))\ - .join((cls, UserRepoToPerm.permission_id == cls.permission_id))\ + q = Session().query(UserRepoToPerm, Repository, cls) \ + .join((Repository, UserRepoToPerm.repository_id == Repository.repo_id)) \ + .join((cls, UserRepoToPerm.permission_id == cls.permission_id)) \ .filter(UserRepoToPerm.user_id == default_user_id) return q.all() @classmethod def get_default_group_perms(cls, default_user_id): - q = Session().query(UserRepoGroupToPerm, RepoGroup, cls)\ - .join((RepoGroup, UserRepoGroupToPerm.group_id == RepoGroup.group_id))\ - .join((cls, UserRepoGroupToPerm.permission_id == cls.permission_id))\ + q = Session().query(UserRepoGroupToPerm, RepoGroup, cls) \ + .join((RepoGroup, UserRepoGroupToPerm.group_id == RepoGroup.group_id)) \ + .join((cls, UserRepoGroupToPerm.permission_id == cls.permission_id)) \ .filter(UserRepoGroupToPerm.user_id == default_user_id) return q.all() @classmethod def get_default_user_group_perms(cls, default_user_id): - q = Session().query(UserUserGroupToPerm, UserGroup, cls)\ - .join((UserGroup, UserUserGroupToPerm.user_group_id == UserGroup.users_group_id))\ - .join((cls, UserUserGroupToPerm.permission_id == cls.permission_id))\ + q = Session().query(UserUserGroupToPerm, UserGroup, cls) \ + .join((UserGroup, UserUserGroupToPerm.user_group_id == UserGroup.users_group_id)) \ + .join((cls, UserUserGroupToPerm.permission_id == cls.permission_id)) \ .filter(UserUserGroupToPerm.user_id == default_user_id) return q.all() @@ -2035,7 +2035,7 @@ class ChangesetComment(Base, BaseModel): :param cls: :param revision: """ - q = Session().query(User)\ + q = Session().query(User) \ .join(ChangesetComment.author) if revision: q = q.filter(cls.revision == revision) @@ -2205,8 +2205,8 @@ class Notification(Base, BaseModel): @property def recipients(self): - return [x.user for x in UserNotification.query()\ - .filter(UserNotification.notification == self)\ + return [x.user for x in UserNotification.query() \ + .filter(UserNotification.notification == self) \ .order_by(UserNotification.user_id.asc()).all()] @classmethod @@ -2305,7 +2305,7 @@ class Gist(Base, BaseModel): :param cls: """ from kallithea.model.gist import GIST_STORE_LOC - q = Session().query(Ui)\ + q = Session().query(Ui) \ .filter(Ui.ui_key == URL_SEP) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return os.path.join(q.one().ui_value, GIST_STORE_LOC) diff --git a/kallithea/lib/dbmigrate/schema/db_2_1_0.py b/kallithea/lib/dbmigrate/schema/db_2_1_0.py --- a/kallithea/lib/dbmigrate/schema/db_2_1_0.py +++ b/kallithea/lib/dbmigrate/schema/db_2_1_0.py @@ -224,7 +224,7 @@ class Setting(Base, BaseModel): @classmethod def get_by_name(cls, key): - return cls.query()\ + return cls.query() \ .filter(cls.app_settings_name == key).scalar() @classmethod @@ -284,7 +284,7 @@ class Setting(Base, BaseModel): @classmethod def get_auth_settings(cls, cache=False): - ret = cls.query()\ + ret = cls.query() \ .filter(cls.app_settings_name.startswith('auth_')).all() fd = {} for row in ret: @@ -294,7 +294,7 @@ class Setting(Base, BaseModel): @classmethod def get_default_repo_settings(cls, cache=False, strip_prefix=False): - ret = cls.query()\ + ret = cls.query() \ .filter(cls.app_settings_name.startswith('default_')).all() fd = {} for row in ret: @@ -523,10 +523,10 @@ class User(Base, BaseModel): if fallback and not res: #fallback to additional keys - _res = UserApiKeys.query()\ - .filter(UserApiKeys.api_key == api_key)\ + _res = UserApiKeys.query() \ + .filter(UserApiKeys.api_key == api_key) \ .filter(or_(UserApiKeys.expires == -1, - UserApiKeys.expires >= time.time()))\ + UserApiKeys.expires >= time.time())) \ .first() if _res: res = _res.user @@ -866,8 +866,8 @@ class RepositoryField(Base, BaseModel): @classmethod def get_by_key_name(cls, key, repo): - row = cls.query()\ - .filter(cls.repository == repo)\ + row = cls.query() \ + .filter(cls.repository == repo) \ .filter(cls.field_key == key).scalar() return row @@ -997,8 +997,8 @@ class Repository(Base, BaseModel): @classmethod def get_by_repo_name(cls, repo_name): q = Session().query(cls).filter(cls.repo_name == repo_name) - q = q.options(joinedload(Repository.fork))\ - .options(joinedload(Repository.user))\ + q = q.options(joinedload(Repository.fork)) \ + .options(joinedload(Repository.user)) \ .options(joinedload(Repository.group)) return q.scalar() @@ -1019,7 +1019,7 @@ class Repository(Base, BaseModel): :param cls: """ - q = Session().query(Ui)\ + q = Session().query(Ui) \ .filter(Ui.ui_key == cls.url_sep()) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value @@ -1088,9 +1088,9 @@ class Repository(Base, BaseModel): """ Returns associated cache keys for that repo """ - return CacheInvalidation.query()\ - .filter(CacheInvalidation.cache_args == self.repo_name)\ - .order_by(CacheInvalidation.cache_key)\ + return CacheInvalidation.query() \ + .filter(CacheInvalidation.cache_args == self.repo_name) \ + .order_by(CacheInvalidation.cache_key) \ .all() def get_new_name(self, repo_name): @@ -1269,7 +1269,7 @@ class Repository(Base, BaseModel): :param revisions: filter query by revisions only """ - cmts = ChangesetComment.query()\ + cmts = ChangesetComment.query() \ .filter(ChangesetComment.repo == self) if revisions: cmts = cmts.filter(ChangesetComment.revision.in_(revisions)) @@ -1285,8 +1285,8 @@ class Repository(Base, BaseModel): :param revisions: list of revisions to get statuses for """ - statuses = ChangesetStatus.query()\ - .filter(ChangesetStatus.repo == self)\ + statuses = ChangesetStatus.query() \ + .filter(ChangesetStatus.repo == self) \ .filter(ChangesetStatus.version == 0) if revisions: statuses = statuses.filter(ChangesetStatus.revision.in_(revisions)) @@ -1432,10 +1432,10 @@ class RepoGroup(Base, BaseModel): @classmethod def get_by_group_name(cls, group_name, cache=False, case_insensitive=False): if case_insensitive: - gr = cls.query()\ + gr = cls.query() \ .filter(cls.group_name.ilike(group_name)) else: - gr = cls.query()\ + gr = cls.query() \ .filter(cls.group_name == group_name) if cache: gr = gr.options(FromCache( @@ -1487,8 +1487,8 @@ class RepoGroup(Base, BaseModel): @property def repositories(self): - return Repository.query()\ - .filter(Repository.group == self)\ + return Repository.query() \ + .filter(Repository.group == self) \ .order_by(Repository.repo_name) @property @@ -1661,27 +1661,27 @@ class Permission(Base, BaseModel): @classmethod def get_default_perms(cls, default_user_id): - q = Session().query(UserRepoToPerm, Repository, cls)\ - .join((Repository, UserRepoToPerm.repository_id == Repository.repo_id))\ - .join((cls, UserRepoToPerm.permission_id == cls.permission_id))\ + q = Session().query(UserRepoToPerm, Repository, cls) \ + .join((Repository, UserRepoToPerm.repository_id == Repository.repo_id)) \ + .join((cls, UserRepoToPerm.permission_id == cls.permission_id)) \ .filter(UserRepoToPerm.user_id == default_user_id) return q.all() @classmethod def get_default_group_perms(cls, default_user_id): - q = Session().query(UserRepoGroupToPerm, RepoGroup, cls)\ - .join((RepoGroup, UserRepoGroupToPerm.group_id == RepoGroup.group_id))\ - .join((cls, UserRepoGroupToPerm.permission_id == cls.permission_id))\ + q = Session().query(UserRepoGroupToPerm, RepoGroup, cls) \ + .join((RepoGroup, UserRepoGroupToPerm.group_id == RepoGroup.group_id)) \ + .join((cls, UserRepoGroupToPerm.permission_id == cls.permission_id)) \ .filter(UserRepoGroupToPerm.user_id == default_user_id) return q.all() @classmethod def get_default_user_group_perms(cls, default_user_id): - q = Session().query(UserUserGroupToPerm, UserGroup, cls)\ - .join((UserGroup, UserUserGroupToPerm.user_group_id == UserGroup.users_group_id))\ - .join((cls, UserUserGroupToPerm.permission_id == cls.permission_id))\ + q = Session().query(UserUserGroupToPerm, UserGroup, cls) \ + .join((UserGroup, UserUserGroupToPerm.user_group_id == UserGroup.users_group_id)) \ + .join((cls, UserUserGroupToPerm.permission_id == cls.permission_id)) \ .filter(UserUserGroupToPerm.user_id == default_user_id) return q.all() @@ -2074,7 +2074,7 @@ class ChangesetComment(Base, BaseModel): :param cls: :param revision: """ - q = Session().query(User)\ + q = Session().query(User) \ .join(ChangesetComment.author) if revision: q = q.filter(cls.revision == revision) @@ -2244,8 +2244,8 @@ class Notification(Base, BaseModel): @property def recipients(self): - return [x.user for x in UserNotification.query()\ - .filter(UserNotification.notification == self)\ + return [x.user for x in UserNotification.query() \ + .filter(UserNotification.notification == self) \ .order_by(UserNotification.user_id.asc()).all()] @classmethod @@ -2344,7 +2344,7 @@ class Gist(Base, BaseModel): :param cls: """ from kallithea.model.gist import GIST_STORE_LOC - q = Session().query(Ui)\ + q = Session().query(Ui) \ .filter(Ui.ui_key == URL_SEP) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return os.path.join(q.one().ui_value, GIST_STORE_LOC) diff --git a/kallithea/lib/dbmigrate/schema/db_2_2_0.py b/kallithea/lib/dbmigrate/schema/db_2_2_0.py --- a/kallithea/lib/dbmigrate/schema/db_2_2_0.py +++ b/kallithea/lib/dbmigrate/schema/db_2_2_0.py @@ -225,7 +225,7 @@ class Setting(Base, BaseModel): @classmethod def get_by_name(cls, key): - return cls.query()\ + return cls.query() \ .filter(cls.app_settings_name == key).scalar() @classmethod @@ -285,7 +285,7 @@ class Setting(Base, BaseModel): @classmethod def get_auth_settings(cls, cache=False): - ret = cls.query()\ + ret = cls.query() \ .filter(cls.app_settings_name.startswith('auth_')).all() fd = {} for row in ret: @@ -295,7 +295,7 @@ class Setting(Base, BaseModel): @classmethod def get_default_repo_settings(cls, cache=False, strip_prefix=False): - ret = cls.query()\ + ret = cls.query() \ .filter(cls.app_settings_name.startswith('default_')).all() fd = {} for row in ret: @@ -550,10 +550,10 @@ class User(Base, BaseModel): if fallback and not res: #fallback to additional keys - _res = UserApiKeys.query()\ - .filter(UserApiKeys.api_key == api_key)\ + _res = UserApiKeys.query() \ + .filter(UserApiKeys.api_key == api_key) \ .filter(or_(UserApiKeys.expires == -1, - UserApiKeys.expires >= time.time()))\ + UserApiKeys.expires >= time.time())) \ .first() if _res: res = _res.user @@ -901,8 +901,8 @@ class RepositoryField(Base, BaseModel): @classmethod def get_by_key_name(cls, key, repo): - row = cls.query()\ - .filter(cls.repository == repo)\ + row = cls.query() \ + .filter(cls.repository == repo) \ .filter(cls.field_key == key).scalar() return row @@ -1037,8 +1037,8 @@ class Repository(Base, BaseModel): @classmethod def get_by_repo_name(cls, repo_name): q = Session().query(cls).filter(cls.repo_name == repo_name) - q = q.options(joinedload(Repository.fork))\ - .options(joinedload(Repository.user))\ + q = q.options(joinedload(Repository.fork)) \ + .options(joinedload(Repository.user)) \ .options(joinedload(Repository.group)) return q.scalar() @@ -1059,7 +1059,7 @@ class Repository(Base, BaseModel): :param cls: """ - q = Session().query(Ui)\ + q = Session().query(Ui) \ .filter(Ui.ui_key == cls.url_sep()) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value @@ -1128,9 +1128,9 @@ class Repository(Base, BaseModel): """ Returns associated cache keys for that repo """ - return CacheInvalidation.query()\ - .filter(CacheInvalidation.cache_args == self.repo_name)\ - .order_by(CacheInvalidation.cache_key)\ + return CacheInvalidation.query() \ + .filter(CacheInvalidation.cache_args == self.repo_name) \ + .order_by(CacheInvalidation.cache_key) \ .all() def get_new_name(self, repo_name): @@ -1315,7 +1315,7 @@ class Repository(Base, BaseModel): :param revisions: filter query by revisions only """ - cmts = ChangesetComment.query()\ + cmts = ChangesetComment.query() \ .filter(ChangesetComment.repo == self) if revisions: cmts = cmts.filter(ChangesetComment.revision.in_(revisions)) @@ -1331,8 +1331,8 @@ class Repository(Base, BaseModel): :param revisions: list of revisions to get statuses for """ - statuses = ChangesetStatus.query()\ - .filter(ChangesetStatus.repo == self)\ + statuses = ChangesetStatus.query() \ + .filter(ChangesetStatus.repo == self) \ .filter(ChangesetStatus.version == 0) if revisions: statuses = statuses.filter(ChangesetStatus.revision.in_(revisions)) @@ -1482,10 +1482,10 @@ class RepoGroup(Base, BaseModel): @classmethod def get_by_group_name(cls, group_name, cache=False, case_insensitive=False): if case_insensitive: - gr = cls.query()\ + gr = cls.query() \ .filter(cls.group_name.ilike(group_name)) else: - gr = cls.query()\ + gr = cls.query() \ .filter(cls.group_name == group_name) if cache: gr = gr.options(FromCache( @@ -1537,8 +1537,8 @@ class RepoGroup(Base, BaseModel): @property def repositories(self): - return Repository.query()\ - .filter(Repository.group == self)\ + return Repository.query() \ + .filter(Repository.group == self) \ .order_by(Repository.repo_name) @property @@ -1714,27 +1714,27 @@ class Permission(Base, BaseModel): @classmethod def get_default_perms(cls, default_user_id): - q = Session().query(UserRepoToPerm, Repository, cls)\ - .join((Repository, UserRepoToPerm.repository_id == Repository.repo_id))\ - .join((cls, UserRepoToPerm.permission_id == cls.permission_id))\ + q = Session().query(UserRepoToPerm, Repository, cls) \ + .join((Repository, UserRepoToPerm.repository_id == Repository.repo_id)) \ + .join((cls, UserRepoToPerm.permission_id == cls.permission_id)) \ .filter(UserRepoToPerm.user_id == default_user_id) return q.all() @classmethod def get_default_group_perms(cls, default_user_id): - q = Session().query(UserRepoGroupToPerm, RepoGroup, cls)\ - .join((RepoGroup, UserRepoGroupToPerm.group_id == RepoGroup.group_id))\ - .join((cls, UserRepoGroupToPerm.permission_id == cls.permission_id))\ + q = Session().query(UserRepoGroupToPerm, RepoGroup, cls) \ + .join((RepoGroup, UserRepoGroupToPerm.group_id == RepoGroup.group_id)) \ + .join((cls, UserRepoGroupToPerm.permission_id == cls.permission_id)) \ .filter(UserRepoGroupToPerm.user_id == default_user_id) return q.all() @classmethod def get_default_user_group_perms(cls, default_user_id): - q = Session().query(UserUserGroupToPerm, UserGroup, cls)\ - .join((UserGroup, UserUserGroupToPerm.user_group_id == UserGroup.users_group_id))\ - .join((cls, UserUserGroupToPerm.permission_id == cls.permission_id))\ + q = Session().query(UserUserGroupToPerm, UserGroup, cls) \ + .join((UserGroup, UserUserGroupToPerm.user_group_id == UserGroup.users_group_id)) \ + .join((cls, UserUserGroupToPerm.permission_id == cls.permission_id)) \ .filter(UserUserGroupToPerm.user_id == default_user_id) return q.all() @@ -2127,7 +2127,7 @@ class ChangesetComment(Base, BaseModel): :param cls: :param revision: """ - q = Session().query(User)\ + q = Session().query(User) \ .join(ChangesetComment.author) if revision: q = q.filter(cls.revision == revision) @@ -2297,8 +2297,8 @@ class Notification(Base, BaseModel): @property def recipients(self): - return [x.user for x in UserNotification.query()\ - .filter(UserNotification.notification == self)\ + return [x.user for x in UserNotification.query() \ + .filter(UserNotification.notification == self) \ .order_by(UserNotification.user_id.asc()).all()] @classmethod @@ -2401,7 +2401,7 @@ class Gist(Base, BaseModel): :param cls: """ from kallithea.model.gist import GIST_STORE_LOC - q = Session().query(Ui)\ + q = Session().query(Ui) \ .filter(Ui.ui_key == URL_SEP) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return os.path.join(q.one().ui_value, GIST_STORE_LOC) diff --git a/kallithea/lib/dbmigrate/schema/db_2_2_3.py b/kallithea/lib/dbmigrate/schema/db_2_2_3.py --- a/kallithea/lib/dbmigrate/schema/db_2_2_3.py +++ b/kallithea/lib/dbmigrate/schema/db_2_2_3.py @@ -225,7 +225,7 @@ class Setting(Base, BaseModel): @classmethod def get_by_name(cls, key): - return cls.query()\ + return cls.query() \ .filter(cls.app_settings_name == key).scalar() @classmethod @@ -285,7 +285,7 @@ class Setting(Base, BaseModel): @classmethod def get_auth_settings(cls, cache=False): - ret = cls.query()\ + ret = cls.query() \ .filter(cls.app_settings_name.startswith('auth_')).all() fd = {} for row in ret: @@ -295,7 +295,7 @@ class Setting(Base, BaseModel): @classmethod def get_default_repo_settings(cls, cache=False, strip_prefix=False): - ret = cls.query()\ + ret = cls.query() \ .filter(cls.app_settings_name.startswith('default_')).all() fd = {} for row in ret: @@ -550,10 +550,10 @@ class User(Base, BaseModel): if fallback and not res: #fallback to additional keys - _res = UserApiKeys.query()\ - .filter(UserApiKeys.api_key == api_key)\ + _res = UserApiKeys.query() \ + .filter(UserApiKeys.api_key == api_key) \ .filter(or_(UserApiKeys.expires == -1, - UserApiKeys.expires >= time.time()))\ + UserApiKeys.expires >= time.time())) \ .first() if _res: res = _res.user @@ -919,8 +919,8 @@ class RepositoryField(Base, BaseModel): @classmethod def get_by_key_name(cls, key, repo): - row = cls.query()\ - .filter(cls.repository == repo)\ + row = cls.query() \ + .filter(cls.repository == repo) \ .filter(cls.field_key == key).scalar() return row @@ -1057,8 +1057,8 @@ class Repository(Base, BaseModel): @classmethod def get_by_repo_name(cls, repo_name): q = Session().query(cls).filter(cls.repo_name == repo_name) - q = q.options(joinedload(Repository.fork))\ - .options(joinedload(Repository.user))\ + q = q.options(joinedload(Repository.fork)) \ + .options(joinedload(Repository.user)) \ .options(joinedload(Repository.group)) return q.scalar() @@ -1079,7 +1079,7 @@ class Repository(Base, BaseModel): :param cls: """ - q = Session().query(Ui)\ + q = Session().query(Ui) \ .filter(Ui.ui_key == cls.url_sep()) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value @@ -1148,9 +1148,9 @@ class Repository(Base, BaseModel): """ Returns associated cache keys for that repo """ - return CacheInvalidation.query()\ - .filter(CacheInvalidation.cache_args == self.repo_name)\ - .order_by(CacheInvalidation.cache_key)\ + return CacheInvalidation.query() \ + .filter(CacheInvalidation.cache_args == self.repo_name) \ + .order_by(CacheInvalidation.cache_key) \ .all() def get_new_name(self, repo_name): @@ -1342,7 +1342,7 @@ class Repository(Base, BaseModel): :param revisions: filter query by revisions only """ - cmts = ChangesetComment.query()\ + cmts = ChangesetComment.query() \ .filter(ChangesetComment.repo == self) if revisions: cmts = cmts.filter(ChangesetComment.revision.in_(revisions)) @@ -1358,8 +1358,8 @@ class Repository(Base, BaseModel): :param revisions: list of revisions to get statuses for """ - statuses = ChangesetStatus.query()\ - .filter(ChangesetStatus.repo == self)\ + statuses = ChangesetStatus.query() \ + .filter(ChangesetStatus.repo == self) \ .filter(ChangesetStatus.version == 0) if revisions: statuses = statuses.filter(ChangesetStatus.revision.in_(revisions)) @@ -1509,10 +1509,10 @@ class RepoGroup(Base, BaseModel): @classmethod def get_by_group_name(cls, group_name, cache=False, case_insensitive=False): if case_insensitive: - gr = cls.query()\ + gr = cls.query() \ .filter(cls.group_name.ilike(group_name)) else: - gr = cls.query()\ + gr = cls.query() \ .filter(cls.group_name == group_name) if cache: gr = gr.options(FromCache( @@ -1564,8 +1564,8 @@ class RepoGroup(Base, BaseModel): @property def repositories(self): - return Repository.query()\ - .filter(Repository.group == self)\ + return Repository.query() \ + .filter(Repository.group == self) \ .order_by(Repository.repo_name) @property @@ -1741,27 +1741,27 @@ class Permission(Base, BaseModel): @classmethod def get_default_perms(cls, default_user_id): - q = Session().query(UserRepoToPerm, Repository, cls)\ - .join((Repository, UserRepoToPerm.repository_id == Repository.repo_id))\ - .join((cls, UserRepoToPerm.permission_id == cls.permission_id))\ + q = Session().query(UserRepoToPerm, Repository, cls) \ + .join((Repository, UserRepoToPerm.repository_id == Repository.repo_id)) \ + .join((cls, UserRepoToPerm.permission_id == cls.permission_id)) \ .filter(UserRepoToPerm.user_id == default_user_id) return q.all() @classmethod def get_default_group_perms(cls, default_user_id): - q = Session().query(UserRepoGroupToPerm, RepoGroup, cls)\ - .join((RepoGroup, UserRepoGroupToPerm.group_id == RepoGroup.group_id))\ - .join((cls, UserRepoGroupToPerm.permission_id == cls.permission_id))\ + q = Session().query(UserRepoGroupToPerm, RepoGroup, cls) \ + .join((RepoGroup, UserRepoGroupToPerm.group_id == RepoGroup.group_id)) \ + .join((cls, UserRepoGroupToPerm.permission_id == cls.permission_id)) \ .filter(UserRepoGroupToPerm.user_id == default_user_id) return q.all() @classmethod def get_default_user_group_perms(cls, default_user_id): - q = Session().query(UserUserGroupToPerm, UserGroup, cls)\ - .join((UserGroup, UserUserGroupToPerm.user_group_id == UserGroup.users_group_id))\ - .join((cls, UserUserGroupToPerm.permission_id == cls.permission_id))\ + q = Session().query(UserUserGroupToPerm, UserGroup, cls) \ + .join((UserGroup, UserUserGroupToPerm.user_group_id == UserGroup.users_group_id)) \ + .join((cls, UserUserGroupToPerm.permission_id == cls.permission_id)) \ .filter(UserUserGroupToPerm.user_id == default_user_id) return q.all() @@ -2173,7 +2173,7 @@ class ChangesetComment(Base, BaseModel): :param cls: :param revision: """ - q = Session().query(User)\ + q = Session().query(User) \ .join(ChangesetComment.author) if revision: q = q.filter(cls.revision == revision) @@ -2343,8 +2343,8 @@ class Notification(Base, BaseModel): @property def recipients(self): - return [x.user for x in UserNotification.query()\ - .filter(UserNotification.notification == self)\ + return [x.user for x in UserNotification.query() \ + .filter(UserNotification.notification == self) \ .order_by(UserNotification.user_id.asc()).all()] @classmethod @@ -2447,7 +2447,7 @@ class Gist(Base, BaseModel): :param cls: """ from kallithea.model.gist import GIST_STORE_LOC - q = Session().query(Ui)\ + q = Session().query(Ui) \ .filter(Ui.ui_key == URL_SEP) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return os.path.join(q.one().ui_value, GIST_STORE_LOC) diff --git a/kallithea/lib/dbmigrate/versions/008_version_1_5_0.py b/kallithea/lib/dbmigrate/versions/008_version_1_5_0.py --- a/kallithea/lib/dbmigrate/versions/008_version_1_5_0.py +++ b/kallithea/lib/dbmigrate/versions/008_version_1_5_0.py @@ -32,8 +32,8 @@ def upgrade(migrate_engine): _Session = meta.Session() ## after adding that column fix all usernames - users_log = _Session.query(db_1_5_0.UserLog)\ - .options(joinedload(db_1_5_0.UserLog.user))\ + users_log = _Session.query(db_1_5_0.UserLog) \ + .options(joinedload(db_1_5_0.UserLog.user)) \ .options(joinedload(db_1_5_0.UserLog.repository)).all() for entry in users_log: diff --git a/kallithea/lib/helpers.py b/kallithea/lib/helpers.py --- a/kallithea/lib/helpers.py +++ b/kallithea/lib/helpers.py @@ -54,7 +54,7 @@ from webhelpers.html.tags import _set_in from kallithea.lib.annotate import annotate_highlight from kallithea.lib.utils import repo_name_slug, get_custom_lexer from kallithea.lib.utils2 import str2bool, safe_unicode, safe_str, \ - get_changeset_safe, datetime_to_time, time_to_datetime, AttributeDict,\ + get_changeset_safe, datetime_to_time, time_to_datetime, AttributeDict, \ safe_int from kallithea.lib.markup_renderer import MarkupRenderer, url_re from kallithea.lib.vcs.exceptions import ChangesetDoesNotExistError @@ -802,8 +802,8 @@ def action_parser(user_log, feed=False, if feed: action = action_str[0].replace('[', '').replace(']', '') else: - action = action_str[0]\ - .replace('[', '')\ + action = action_str[0] \ + .replace('[', '') \ .replace(']', '') action_params_func = lambda: "" @@ -879,10 +879,10 @@ def gravatar_url(email_address, size=30, tmpl = _gravatar_url parsed_url = urlparse.urlparse(url.current(qualified=True)) - tmpl = tmpl.replace('{email}', email_address)\ + tmpl = tmpl.replace('{email}', email_address) \ .replace('{md5email}', _md5(safe_str(email_address).lower())) \ - .replace('{netloc}', parsed_url.netloc)\ - .replace('{scheme}', parsed_url.scheme)\ + .replace('{netloc}', parsed_url.netloc) \ + .replace('{scheme}', parsed_url.scheme) \ .replace('{size}', safe_str(size)) return tmpl diff --git a/kallithea/lib/middleware/simplegit.py b/kallithea/lib/middleware/simplegit.py --- a/kallithea/lib/middleware/simplegit.py +++ b/kallithea/lib/middleware/simplegit.py @@ -38,7 +38,7 @@ from webob.exc import HTTPNotFound, HTTP HTTPNotAcceptable from kallithea.model.db import User, Ui -from kallithea.lib.utils2 import safe_str, fix_PATH, get_server_url,\ +from kallithea.lib.utils2 import safe_str, fix_PATH, get_server_url, \ _set_extras from kallithea.lib.base import BaseVCSController, WSGIResultCloseCallback from kallithea.lib.utils import make_ui, is_valid_repo diff --git a/kallithea/lib/middleware/simplehg.py b/kallithea/lib/middleware/simplehg.py --- a/kallithea/lib/middleware/simplehg.py +++ b/kallithea/lib/middleware/simplehg.py @@ -37,7 +37,7 @@ from webob.exc import HTTPNotFound, HTTP HTTPNotAcceptable from kallithea.model.db import User -from kallithea.lib.utils2 import safe_str, fix_PATH, get_server_url,\ +from kallithea.lib.utils2 import safe_str, fix_PATH, get_server_url, \ _set_extras from kallithea.lib.base import BaseVCSController, WSGIResultCloseCallback from kallithea.lib.utils import make_ui, is_valid_repo, ui_sections diff --git a/kallithea/lib/paster_commands/make_index.py b/kallithea/lib/paster_commands/make_index.py --- a/kallithea/lib/paster_commands/make_index.py +++ b/kallithea/lib/paster_commands/make_index.py @@ -76,7 +76,7 @@ class Command(BasePasterCommand): WhooshIndexingDaemon(index_location=index_location, repo_location=repo_location, repo_list=repo_list, - repo_update_list=repo_update_list)\ + repo_update_list=repo_update_list) \ .run(full_index=self.options.full_index) l.release() except LockHeld: diff --git a/kallithea/lib/paster_commands/setup_db.py b/kallithea/lib/paster_commands/setup_db.py --- a/kallithea/lib/paster_commands/setup_db.py +++ b/kallithea/lib/paster_commands/setup_db.py @@ -41,11 +41,10 @@ class Command(AbstractInstallCommand): group_name = "Kallithea" description = """\ - - Setup Kallithea according to its configuration file. This is - the second part of a two-phase web application installation - process (the first phase is prepare-app). The setup process - consist of things like setting up databases, creating super user + Setup Kallithea according to its configuration file. This is + the second part of a two-phase web application installation + process (the first phase is prepare-app). The setup process + consist of things like setting up databases, creating super user """ parser = AbstractInstallCommand.standard_parser( diff --git a/kallithea/lib/paster_commands/update_repoinfo.py b/kallithea/lib/paster_commands/update_repoinfo.py --- a/kallithea/lib/paster_commands/update_repoinfo.py +++ b/kallithea/lib/paster_commands/update_repoinfo.py @@ -61,7 +61,7 @@ class Command(BasePasterCommand): if self.options.repo_update_list else None if repo_update_list is not None: - repo_list = list(Repository.query()\ + repo_list = list(Repository.query() \ .filter(Repository.repo_name.in_(repo_update_list))) else: repo_list = Repository.getAll() diff --git a/kallithea/lib/utils.py b/kallithea/lib/utils.py --- a/kallithea/lib/utils.py +++ b/kallithea/lib/utils.py @@ -654,7 +654,7 @@ def create_test_index(repo_location, con try: l = DaemonLock(file_=jn(dn(index_location), 'make_index.lock')) WhooshIndexingDaemon(index_location=index_location, - repo_location=repo_location)\ + repo_location=repo_location) \ .run(full_index=full_index) l.release() except LockHeld: diff --git a/kallithea/lib/vcs/backends/git/inmemory.py b/kallithea/lib/vcs/backends/git/inmemory.py --- a/kallithea/lib/vcs/backends/git/inmemory.py +++ b/kallithea/lib/vcs/backends/git/inmemory.py @@ -40,7 +40,7 @@ class GitInMemoryChangeset(BaseInMemoryC ENCODING = "UTF-8" # Create tree and populates it with blobs - commit_tree = self.parents[0] and repo[self.parents[0]._commit.tree] or\ + commit_tree = self.parents[0] and repo[self.parents[0]._commit.tree] or \ objects.Tree() for node in self.added + self.changed: # Compute subdirs if needed diff --git a/kallithea/lib/vcs/backends/hg/repository.py b/kallithea/lib/vcs/backends/hg/repository.py --- a/kallithea/lib/vcs/backends/hg/repository.py +++ b/kallithea/lib/vcs/backends/hg/repository.py @@ -361,10 +361,10 @@ class MercurialRepository(BaseRepository return localrepository(self.baseui, self.path, create=create) except (Abort, RepoError) as err: if create: - msg = "Cannot create repository at %s. Original error was %s"\ + msg = "Cannot create repository at %s. Original error was %s" \ % (self.path, err) else: - msg = "Not valid repository at %s. Original error was %s"\ + msg = "Not valid repository at %s. Original error was %s" \ % (self.path, err) raise RepositoryError(msg) diff --git a/kallithea/lib/vcs/utils/__init__.py b/kallithea/lib/vcs/utils/__init__.py --- a/kallithea/lib/vcs/utils/__init__.py +++ b/kallithea/lib/vcs/utils/__init__.py @@ -186,5 +186,5 @@ def author_name(author): return '' if not '@' in author: return author - return author.replace(author_email(author), '').replace('<', '')\ + return author.replace(author_email(author), '').replace('<', '') \ .replace('>', '').strip() diff --git a/kallithea/lib/vcs/utils/annotate.py b/kallithea/lib/vcs/utils/annotate.py --- a/kallithea/lib/vcs/utils/annotate.py +++ b/kallithea/lib/vcs/utils/annotate.py @@ -41,7 +41,7 @@ class AnnotateHtmlFormatter(HtmlFormatte following function as ``annotate_from_changeset_func``:: def changeset_to_anchor(changeset): - return '%s\n' %\ + return '%s\n' % \ (changeset.id, changeset.id) :param annotate_from_changeset_func: see above diff --git a/kallithea/lib/vcs/utils/diffs.py b/kallithea/lib/vcs/utils/diffs.py --- a/kallithea/lib/vcs/utils/diffs.py +++ b/kallithea/lib/vcs/utils/diffs.py @@ -389,15 +389,15 @@ class DiffProcessor(object): diff_lines = self.prepare() _html_empty = True _html = [] - _html.append('''\n''' \ - % {'table_class': table_class}) + _html.append('''
\n''' + % {'table_class': table_class}) for diff in diff_lines: for line in diff['chunks']: _html_empty = False for change in line: - _html.append('''\n''' \ - % {'line_class': line_class, - 'action': change['action']}) + _html.append('''\n''' + % {'line_class': line_class, + 'action': change['action']}) anchor_old_id = '' anchor_new_id = '' anchor_old = "%(filename)s_o%(oldline_no)s" % \ @@ -417,35 +417,32 @@ class DiffProcessor(object): ########################################################### # OLD LINE NUMBER ########################################################### - _html.append('''\t\n''') ########################################################### # NEW LINE NUMBER ########################################################### - _html.append('''\t\n''') ########################################################### # CODE ########################################################### - _html.append('''\t''') _html.append('''\n\n''') _html.append('''
''' \ - % {'a_id': anchor_old_id, - 'old_lineno_cls': old_lineno_class}) + _html.append('''\t''' + % {'a_id': anchor_old_id, + 'old_lineno_cls': old_lineno_class}) - _html.append('''
%(link)s
''' \ - % {'link': - _link_to_if(cond_old, change['old_lineno'], '#%s' \ - % anchor_old)}) + _html.append('''
%(link)s
''' + % {'link': + _link_to_if(cond_old, change['old_lineno'], '#%s' % anchor_old)}) _html.append('''		''' \ - % {'a_id': anchor_new_id, - 'new_lineno_cls': new_lineno_class}) + _html.append('''\t''' + % {'a_id': anchor_new_id, + 'new_lineno_cls': new_lineno_class}) - _html.append('''
%(link)s
''' \ - % {'link': - _link_to_if(cond_new, change['new_lineno'], '#%s' \ - % anchor_new)}) + _html.append('''
%(link)s
''' + % {'link': _link_to_if(cond_new, change['new_lineno'], '#%s' % anchor_new)}) _html.append('''		''' \ - % {'code_class': code_class}) - _html.append('''\n\t\t
%(code)s
\n''' \ - % {'code': change['line']}) + _html.append('''\t		''' + % {'code_class': code_class}) + _html.append('''\n\t\t
%(code)s
\n''' + % {'code': change['line']}) _html.append('''\t
''') diff --git a/kallithea/lib/vcs/utils/imports.py b/kallithea/lib/vcs/utils/imports.py --- a/kallithea/lib/vcs/utils/imports.py +++ b/kallithea/lib/vcs/utils/imports.py @@ -19,7 +19,7 @@ def import_class(class_path): try: class_mod = __import__(mod_path, {}, {}, [class_name]) except ImportError as err: - msg = "There was problem while trying to import backend class. "\ + msg = "There was problem while trying to import backend class. " \ "Original error was:\n%s" % err raise VCSError(msg) cls = getattr(class_mod, class_name) diff --git a/kallithea/model/api_key.py b/kallithea/model/api_key.py --- a/kallithea/model/api_key.py +++ b/kallithea/model/api_key.py @@ -73,10 +73,10 @@ class ApiKeyModel(BaseModel): def get_api_keys(self, user, show_expired=True): user = self._get_user(user) - user_api_keys = UserApiKeys.query()\ + user_api_keys = UserApiKeys.query() \ .filter(UserApiKeys.user_id == user.user_id) if not show_expired: - user_api_keys = user_api_keys\ + user_api_keys = user_api_keys \ .filter(or_(UserApiKeys.expires == -1, UserApiKeys.expires >= time.time())) return user_api_keys diff --git a/kallithea/model/changeset_status.py b/kallithea/model/changeset_status.py --- a/kallithea/model/changeset_status.py +++ b/kallithea/model/changeset_status.py @@ -49,7 +49,7 @@ class ChangesetStatusModel(BaseModel): with_revisions=False): repo = self._get_repo(repo) - q = ChangesetStatus.query()\ + q = ChangesetStatus.query() \ .filter(ChangesetStatus.repo == repo) if not with_revisions: q = q.filter(ChangesetStatus.version == 0) diff --git a/kallithea/model/comment.py b/kallithea/model/comment.py --- a/kallithea/model/comment.py +++ b/kallithea/model/comment.py @@ -210,7 +210,7 @@ class ChangesetCommentsModel(BaseModel): email_kwargs=email_kwargs, ) - mention_recipients = set(self._extract_mentions(body))\ + mention_recipients = set(self._extract_mentions(body)) \ .difference(recipients) if mention_recipients: email_kwargs['is_mention'] = True @@ -260,14 +260,14 @@ class ChangesetCommentsModel(BaseModel): q = Session().query(ChangesetComment) if inline: - q = q.filter(ChangesetComment.line_no != None)\ + q = q.filter(ChangesetComment.line_no != None) \ .filter(ChangesetComment.f_path != None) else: - q = q.filter(ChangesetComment.line_no == None)\ + q = q.filter(ChangesetComment.line_no == None) \ .filter(ChangesetComment.f_path == None) if revision is not None: - q = q.filter(ChangesetComment.revision == revision)\ + q = q.filter(ChangesetComment.revision == revision) \ .filter(ChangesetComment.repo_id == repo_id) elif pull_request is not None: pull_request = self.__get_pull_request(pull_request) diff --git a/kallithea/model/db.py b/kallithea/model/db.py --- a/kallithea/model/db.py +++ b/kallithea/model/db.py @@ -225,7 +225,7 @@ class Setting(Base, BaseModel): @classmethod def get_by_name(cls, key): - return cls.query()\ + return cls.query() \ .filter(cls.app_settings_name == key).scalar() @classmethod @@ -285,7 +285,7 @@ class Setting(Base, BaseModel): @classmethod def get_auth_settings(cls, cache=False): - ret = cls.query()\ + ret = cls.query() \ .filter(cls.app_settings_name.startswith('auth_')).all() fd = {} for row in ret: @@ -294,7 +294,7 @@ class Setting(Base, BaseModel): @classmethod def get_default_repo_settings(cls, cache=False, strip_prefix=False): - ret = cls.query()\ + ret = cls.query() \ .filter(cls.app_settings_name.startswith('default_')).all() fd = {} for row in ret: @@ -574,10 +574,10 @@ class User(Base, BaseModel): if fallback and not res: #fallback to additional keys - _res = UserApiKeys.query()\ - .filter(UserApiKeys.api_key == api_key)\ + _res = UserApiKeys.query() \ + .filter(UserApiKeys.api_key == api_key) \ .filter(or_(UserApiKeys.expires == -1, - UserApiKeys.expires >= time.time()))\ + UserApiKeys.expires >= time.time())) \ .first() if _res: res = _res.user @@ -946,8 +946,8 @@ class RepositoryField(Base, BaseModel): @classmethod def get_by_key_name(cls, key, repo): - row = cls.query()\ - .filter(cls.repository == repo)\ + row = cls.query() \ + .filter(cls.repository == repo) \ .filter(cls.field_key == key).scalar() return row @@ -1082,8 +1082,8 @@ class Repository(Base, BaseModel): @classmethod def get_by_repo_name(cls, repo_name): q = Session().query(cls).filter(cls.repo_name == repo_name) - q = q.options(joinedload(Repository.fork))\ - .options(joinedload(Repository.user))\ + q = q.options(joinedload(Repository.fork)) \ + .options(joinedload(Repository.user)) \ .options(joinedload(Repository.group)) return q.scalar() @@ -1104,7 +1104,7 @@ class Repository(Base, BaseModel): :param cls: """ - q = Session().query(Ui)\ + q = Session().query(Ui) \ .filter(Ui.ui_key == cls.url_sep()) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value @@ -1173,9 +1173,9 @@ class Repository(Base, BaseModel): """ Returns associated cache keys for that repo """ - return CacheInvalidation.query()\ - .filter(CacheInvalidation.cache_args == self.repo_name)\ - .order_by(CacheInvalidation.cache_key)\ + return CacheInvalidation.query() \ + .filter(CacheInvalidation.cache_args == self.repo_name) \ + .order_by(CacheInvalidation.cache_key) \ .all() def get_new_name(self, repo_name): @@ -1377,7 +1377,7 @@ class Repository(Base, BaseModel): :param revisions: filter query by revisions only """ - cmts = ChangesetComment.query()\ + cmts = ChangesetComment.query() \ .filter(ChangesetComment.repo == self) if revisions is not None: if not revisions: @@ -1398,9 +1398,9 @@ class Repository(Base, BaseModel): if not revisions: return {} - statuses = ChangesetStatus.query()\ - .filter(ChangesetStatus.repo == self)\ - .filter(ChangesetStatus.version == 0)\ + statuses = ChangesetStatus.query() \ + .filter(ChangesetStatus.repo == self) \ + .filter(ChangesetStatus.version == 0) \ .filter(ChangesetStatus.revision.in_(revisions)) grouped = {} @@ -1527,10 +1527,10 @@ class RepoGroup(Base, BaseModel): @classmethod def get_by_group_name(cls, group_name, cache=False, case_insensitive=False): if case_insensitive: - gr = cls.query()\ + gr = cls.query() \ .filter(cls.group_name.ilike(group_name)) else: - gr = cls.query()\ + gr = cls.query() \ .filter(cls.group_name == group_name) if cache: gr = gr.options(FromCache( @@ -1582,8 +1582,8 @@ class RepoGroup(Base, BaseModel): @property def repositories(self): - return Repository.query()\ - .filter(Repository.group == self)\ + return Repository.query() \ + .filter(Repository.group == self) \ .order_by(Repository.repo_name) @property @@ -1761,27 +1761,27 @@ class Permission(Base, BaseModel): @classmethod def get_default_perms(cls, default_user_id): - q = Session().query(UserRepoToPerm, Repository, cls)\ - .join((Repository, UserRepoToPerm.repository_id == Repository.repo_id))\ - .join((cls, UserRepoToPerm.permission_id == cls.permission_id))\ + q = Session().query(UserRepoToPerm, Repository, cls) \ + .join((Repository, UserRepoToPerm.repository_id == Repository.repo_id)) \ + .join((cls, UserRepoToPerm.permission_id == cls.permission_id)) \ .filter(UserRepoToPerm.user_id == default_user_id) return q.all() @classmethod def get_default_group_perms(cls, default_user_id): - q = Session().query(UserRepoGroupToPerm, RepoGroup, cls)\ - .join((RepoGroup, UserRepoGroupToPerm.group_id == RepoGroup.group_id))\ - .join((cls, UserRepoGroupToPerm.permission_id == cls.permission_id))\ + q = Session().query(UserRepoGroupToPerm, RepoGroup, cls) \ + .join((RepoGroup, UserRepoGroupToPerm.group_id == RepoGroup.group_id)) \ + .join((cls, UserRepoGroupToPerm.permission_id == cls.permission_id)) \ .filter(UserRepoGroupToPerm.user_id == default_user_id) return q.all() @classmethod def get_default_user_group_perms(cls, default_user_id): - q = Session().query(UserUserGroupToPerm, UserGroup, cls)\ - .join((UserGroup, UserUserGroupToPerm.user_group_id == UserGroup.users_group_id))\ - .join((cls, UserUserGroupToPerm.permission_id == cls.permission_id))\ + q = Session().query(UserUserGroupToPerm, UserGroup, cls) \ + .join((UserGroup, UserUserGroupToPerm.user_group_id == UserGroup.users_group_id)) \ + .join((cls, UserUserGroupToPerm.permission_id == cls.permission_id)) \ .filter(UserUserGroupToPerm.user_id == default_user_id) return q.all() @@ -2187,7 +2187,7 @@ class ChangesetComment(Base, BaseModel): :param cls: :param revision: """ - q = Session().query(User)\ + q = Session().query(User) \ .join(ChangesetComment.author) if revision is not None: q = q.filter(cls.revision == revision) @@ -2314,10 +2314,10 @@ class PullRequest(Base, BaseModel): def user_review_status(self, user_id): """Return the user's latest status votes on PR""" # note: no filtering on repo - that would be redundant - status = ChangesetStatus.query()\ - .filter(ChangesetStatus.pull_request == self)\ - .filter(ChangesetStatus.user_id == user_id)\ - .order_by(ChangesetStatus.version)\ + status = ChangesetStatus.query() \ + .filter(ChangesetStatus.pull_request == self) \ + .filter(ChangesetStatus.user_id == user_id) \ + .order_by(ChangesetStatus.version) \ .first() return str(status.status) if status else '' @@ -2505,7 +2505,7 @@ class Gist(Base, BaseModel): :param cls: """ from kallithea.model.gist import GIST_STORE_LOC - q = Session().query(Ui)\ + q = Session().query(Ui) \ .filter(Ui.ui_key == URL_SEP) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return os.path.join(q.one().ui_value, GIST_STORE_LOC) diff --git a/kallithea/model/notification.py b/kallithea/model/notification.py --- a/kallithea/model/notification.py +++ b/kallithea/model/notification.py @@ -137,11 +137,11 @@ class NotificationModel(BaseModel): html_kwargs.update(email_kwargs) txt_kwargs.update(email_kwargs) - email_subject = EmailNotificationModel()\ + email_subject = EmailNotificationModel() \ .get_email_description(type_, **txt_kwargs) - email_txt_body = EmailNotificationModel()\ + email_txt_body = EmailNotificationModel() \ .get_email_tmpl(type_, 'txt', **txt_kwargs) - email_html_body = EmailNotificationModel()\ + email_html_body = EmailNotificationModel() \ .get_email_tmpl(type_, 'html', **html_kwargs) run_task(tasks.send_email, [rec.email], email_subject, email_txt_body, @@ -155,10 +155,10 @@ class NotificationModel(BaseModel): notification = self.__get_notification(notification) user = self._get_user(user) if notification and user: - obj = UserNotification.query()\ - .filter(UserNotification.user == user)\ + obj = UserNotification.query() \ + .filter(UserNotification.user == user) \ .filter(UserNotification.notification - == notification)\ + == notification) \ .one() Session().delete(obj) return True @@ -175,12 +175,12 @@ class NotificationModel(BaseModel): """ user = self._get_user(user) - q = UserNotification.query()\ - .filter(UserNotification.user == user)\ + q = UserNotification.query() \ + .filter(UserNotification.user == user) \ .join((Notification, UserNotification.notification_id == - Notification.notification_id))\ - .options(joinedload('notification'))\ - .options(subqueryload('notification.created_by_user'))\ + Notification.notification_id)) \ + .options(joinedload('notification')) \ + .options(subqueryload('notification.created_by_user')) \ .order_by(Notification.created_on.desc()) if filter_: @@ -193,10 +193,10 @@ class NotificationModel(BaseModel): notification = self.__get_notification(notification) user = self._get_user(user) if notification and user: - obj = UserNotification.query()\ - .filter(UserNotification.user == user)\ + obj = UserNotification.query() \ + .filter(UserNotification.user == user) \ .filter(UserNotification.notification - == notification)\ + == notification) \ .one() obj.read = True Session().add(obj) @@ -207,9 +207,9 @@ class NotificationModel(BaseModel): def mark_all_read_for_user(self, user, filter_=None): user = self._get_user(user) - q = UserNotification.query()\ - .filter(UserNotification.user == user)\ - .filter(UserNotification.read == False)\ + q = UserNotification.query() \ + .filter(UserNotification.user == user) \ + .filter(UserNotification.read == False) \ .join((Notification, UserNotification.notification_id == Notification.notification_id)) if filter_: @@ -223,22 +223,22 @@ class NotificationModel(BaseModel): def get_unread_cnt_for_user(self, user): user = self._get_user(user) - return UserNotification.query()\ - .filter(UserNotification.read == False)\ + return UserNotification.query() \ + .filter(UserNotification.read == False) \ .filter(UserNotification.user == user).count() def get_unread_for_user(self, user): user = self._get_user(user) - return [x.notification for x in UserNotification.query()\ - .filter(UserNotification.read == False)\ + return [x.notification for x in UserNotification.query() \ + .filter(UserNotification.read == False) \ .filter(UserNotification.user == user).all()] def get_user_notification(self, user, notification): user = self._get_user(user) notification = self.__get_notification(notification) - return UserNotification.query()\ - .filter(UserNotification.notification == notification)\ + return UserNotification.query() \ + .filter(UserNotification.notification == notification) \ .filter(UserNotification.user == user).scalar() def make_description(self, notification, show_age=True): diff --git a/kallithea/model/permission.py b/kallithea/model/permission.py --- a/kallithea/model/permission.py +++ b/kallithea/model/permission.py @@ -32,7 +32,7 @@ import traceback from sqlalchemy.exc import DatabaseError from kallithea.model import BaseModel -from kallithea.model.db import User, Permission, UserToPerm, UserRepoToPerm,\ +from kallithea.model.db import User, Permission, UserToPerm, UserRepoToPerm, \ UserRepoGroupToPerm, UserUserGroupToPerm from kallithea.lib.utils2 import str2bool @@ -116,8 +116,8 @@ class PermissionModel(BaseModel): # clear current entries, to make this function idempotent # it will fix even if we define more permissions or permissions # are somehow missing - u2p = self.sa.query(UserToPerm)\ - .filter(UserToPerm.user == perm_user)\ + u2p = self.sa.query(UserToPerm) \ + .filter(UserToPerm.user == perm_user) \ .all() for p in u2p: self.sa.delete(p) @@ -140,8 +140,8 @@ class PermissionModel(BaseModel): _def_name = form_result['default_repo_perm'].split('repository.')[-1] _def = Permission.get_by_key('repository.' + _def_name) # repos - for r2p in self.sa.query(UserRepoToPerm)\ - .filter(UserRepoToPerm.user == perm_user)\ + for r2p in self.sa.query(UserRepoToPerm) \ + .filter(UserRepoToPerm.user == perm_user) \ .all(): #don't reset PRIVATE repositories @@ -153,8 +153,8 @@ class PermissionModel(BaseModel): _def_name = form_result['default_group_perm'].split('group.')[-1] # groups _def = Permission.get_by_key('group.' + _def_name) - for g2p in self.sa.query(UserRepoGroupToPerm)\ - .filter(UserRepoGroupToPerm.user == perm_user)\ + for g2p in self.sa.query(UserRepoGroupToPerm) \ + .filter(UserRepoGroupToPerm.user == perm_user) \ .all(): g2p.permission = _def self.sa.add(g2p) @@ -163,8 +163,8 @@ class PermissionModel(BaseModel): _def_name = form_result['default_user_group_perm'].split('usergroup.')[-1] # groups _def = Permission.get_by_key('usergroup.' + _def_name) - for g2p in self.sa.query(UserUserGroupToPerm)\ - .filter(UserUserGroupToPerm.user == perm_user)\ + for g2p in self.sa.query(UserUserGroupToPerm) \ + .filter(UserUserGroupToPerm.user == perm_user) \ .all(): g2p.permission = _def self.sa.add(g2p) diff --git a/kallithea/model/pull_request.py b/kallithea/model/pull_request.py --- a/kallithea/model/pull_request.py +++ b/kallithea/model/pull_request.py @@ -34,7 +34,7 @@ from kallithea.model.meta import Session from kallithea.lib import helpers as h from kallithea.lib.exceptions import UserInvalidException from kallithea.model import BaseModel -from kallithea.model.db import PullRequest, PullRequestReviewers, Notification,\ +from kallithea.model.db import PullRequest, PullRequestReviewers, Notification, \ ChangesetStatus, User from kallithea.model.notification import NotificationModel from kallithea.lib.utils2 import extract_mentioned_users, safe_unicode @@ -51,10 +51,10 @@ class PullRequestModel(BaseModel): return self._get_instance(PullRequest, pull_request) def get_pullrequest_cnt_for_user(self, user): - return PullRequest.query()\ - .join(PullRequestReviewers)\ - .filter(PullRequestReviewers.user_id == user)\ - .filter(PullRequest.status != PullRequest.STATUS_CLOSED)\ + return PullRequest.query() \ + .join(PullRequestReviewers) \ + .filter(PullRequestReviewers.user_id == user) \ + .filter(PullRequest.status != PullRequest.STATUS_CLOSED) \ .count() def get_all(self, repo_name, from_=False, closed=False): @@ -184,9 +184,9 @@ class PullRequestModel(BaseModel): def update_reviewers(self, user, pull_request, reviewers_ids): reviewers_ids = set(reviewers_ids) pull_request = self.__get_pull_request(pull_request) - current_reviewers = PullRequestReviewers.query()\ + current_reviewers = PullRequestReviewers.query() \ .filter(PullRequestReviewers.pull_request== - pull_request)\ + pull_request) \ .all() current_reviewers_ids = set([x.user.user_id for x in current_reviewers]) @@ -198,9 +198,9 @@ class PullRequestModel(BaseModel): log.debug("Removing %s reviewers", to_remove) for uid in to_remove: - reviewer = PullRequestReviewers.query()\ + reviewer = PullRequestReviewers.query() \ .filter(PullRequestReviewers.user_id==uid, - PullRequestReviewers.pull_request==pull_request)\ + PullRequestReviewers.pull_request==pull_request) \ .scalar() if reviewer: Session().delete(reviewer) diff --git a/kallithea/model/repo_group.py b/kallithea/model/repo_group.py --- a/kallithea/model/repo_group.py +++ b/kallithea/model/repo_group.py @@ -455,9 +455,9 @@ class RepoGroupModel(BaseModel): permission = self._get_perm(perm) # check if we have that permission already - obj = self.sa.query(UserRepoGroupToPerm)\ - .filter(UserRepoGroupToPerm.user == user)\ - .filter(UserRepoGroupToPerm.group == repo_group)\ + obj = self.sa.query(UserRepoGroupToPerm) \ + .filter(UserRepoGroupToPerm.user == user) \ + .filter(UserRepoGroupToPerm.group == repo_group) \ .scalar() if obj is None: # create new ! @@ -481,9 +481,9 @@ class RepoGroupModel(BaseModel): repo_group = self._get_repo_group(repo_group) user = self._get_user(user) - obj = self.sa.query(UserRepoGroupToPerm)\ - .filter(UserRepoGroupToPerm.user == user)\ - .filter(UserRepoGroupToPerm.group == repo_group)\ + obj = self.sa.query(UserRepoGroupToPerm) \ + .filter(UserRepoGroupToPerm.user == user) \ + .filter(UserRepoGroupToPerm.group == repo_group) \ .scalar() if obj is not None: self.sa.delete(obj) @@ -505,9 +505,9 @@ class RepoGroupModel(BaseModel): permission = self._get_perm(perm) # check if we have that permission already - obj = self.sa.query(UserGroupRepoGroupToPerm)\ - .filter(UserGroupRepoGroupToPerm.group == repo_group)\ - .filter(UserGroupRepoGroupToPerm.users_group == group_name)\ + obj = self.sa.query(UserGroupRepoGroupToPerm) \ + .filter(UserGroupRepoGroupToPerm.group == repo_group) \ + .filter(UserGroupRepoGroupToPerm.users_group == group_name) \ .scalar() if obj is None: @@ -533,9 +533,9 @@ class RepoGroupModel(BaseModel): repo_group = self._get_repo_group(repo_group) group_name = self._get_user_group(group_name) - obj = self.sa.query(UserGroupRepoGroupToPerm)\ - .filter(UserGroupRepoGroupToPerm.group == repo_group)\ - .filter(UserGroupRepoGroupToPerm.users_group == group_name)\ + obj = self.sa.query(UserGroupRepoGroupToPerm) \ + .filter(UserGroupRepoGroupToPerm.group == repo_group) \ + .filter(UserGroupRepoGroupToPerm.users_group == group_name) \ .scalar() if obj is not None: self.sa.delete(obj) diff --git a/kallithea/model/scm.py b/kallithea/model/scm.py --- a/kallithea/model/scm.py +++ b/kallithea/model/scm.py @@ -46,9 +46,9 @@ from kallithea.lib.vcs.backends.base imp from kallithea import BACKENDS from kallithea.lib import helpers as h -from kallithea.lib.utils2 import safe_str, safe_unicode, get_server_url,\ +from kallithea.lib.utils2 import safe_str, safe_unicode, get_server_url, \ _set_extras -from kallithea.lib.auth import HasRepoPermissionAny, HasRepoGroupPermissionAny,\ +from kallithea.lib.auth import HasRepoPermissionAny, HasRepoGroupPermissionAny, \ HasUserGroupPermissionAny, HasPermissionAny, HasPermissionAll from kallithea.lib.utils import get_filesystem_repos, make_ui, \ action_logger @@ -311,8 +311,8 @@ class ScmModel(BaseModel): :param simple: use SimpleCachedList - one without the SCM info """ if all_repos is None: - all_repos = self.sa.query(Repository)\ - .filter(Repository.group_id == None)\ + all_repos = self.sa.query(Repository) \ + .filter(Repository.group_id == None) \ .order_by(func.lower(Repository.repo_name)).all() if simple: repo_iter = SimpleCachedRepoList(all_repos, @@ -327,7 +327,7 @@ class ScmModel(BaseModel): def get_repo_groups(self, all_groups=None): if all_groups is None: - all_groups = RepoGroup.query()\ + all_groups = RepoGroup.query() \ .filter(RepoGroup.group_parent_id == None).all() return [x for x in RepoGroupList(all_groups)] @@ -344,8 +344,8 @@ class ScmModel(BaseModel): def toggle_following_repo(self, follow_repo_id, user_id): - f = self.sa.query(UserFollowing)\ - .filter(UserFollowing.follows_repo_id == follow_repo_id)\ + f = self.sa.query(UserFollowing) \ + .filter(UserFollowing.follows_repo_id == follow_repo_id) \ .filter(UserFollowing.user_id == user_id).scalar() if f is not None: @@ -373,8 +373,8 @@ class ScmModel(BaseModel): raise def toggle_following_user(self, follow_user_id, user_id): - f = self.sa.query(UserFollowing)\ - .filter(UserFollowing.follows_user_id == follow_user_id)\ + f = self.sa.query(UserFollowing) \ + .filter(UserFollowing.follows_user_id == follow_user_id) \ .filter(UserFollowing.user_id == user_id).scalar() if f is not None: @@ -395,11 +395,11 @@ class ScmModel(BaseModel): raise def is_following_repo(self, repo_name, user_id, cache=False): - r = self.sa.query(Repository)\ + r = self.sa.query(Repository) \ .filter(Repository.repo_name == repo_name).scalar() - f = self.sa.query(UserFollowing)\ - .filter(UserFollowing.follows_repository == r)\ + f = self.sa.query(UserFollowing) \ + .filter(UserFollowing.follows_repository == r) \ .filter(UserFollowing.user_id == user_id).scalar() return f is not None @@ -407,8 +407,8 @@ class ScmModel(BaseModel): def is_following_user(self, username, user_id, cache=False): u = User.get_by_username(username) - f = self.sa.query(UserFollowing)\ - .filter(UserFollowing.follows_user == u)\ + f = self.sa.query(UserFollowing) \ + .filter(UserFollowing.follows_user == u) \ .filter(UserFollowing.user_id == user_id).scalar() return f is not None @@ -416,18 +416,18 @@ class ScmModel(BaseModel): def get_followers(self, repo): repo = self._get_repo(repo) - return self.sa.query(UserFollowing)\ + return self.sa.query(UserFollowing) \ .filter(UserFollowing.follows_repository == repo).count() def get_forks(self, repo): repo = self._get_repo(repo) - return self.sa.query(Repository)\ + return self.sa.query(Repository) \ .filter(Repository.fork == repo).count() def get_pull_requests(self, repo): repo = self._get_repo(repo) - return self.sa.query(PullRequest)\ - .filter(PullRequest.other_repo == repo)\ + return self.sa.query(PullRequest) \ + .filter(PullRequest.other_repo == repo) \ .filter(PullRequest.status != PullRequest.STATUS_CLOSED).count() def mark_as_fork(self, repo, fork, user): diff --git a/kallithea/model/user.py b/kallithea/model/user.py --- a/kallithea/model/user.py +++ b/kallithea/model/user.py @@ -425,7 +425,7 @@ class UserModel(BaseModel): perm = self._get_perm(perm) user = self._get_user(user) - return UserToPerm.query().filter(UserToPerm.user == user)\ + return UserToPerm.query().filter(UserToPerm.user == user) \ .filter(UserToPerm.permission == perm).scalar() is not None def grant_perm(self, user, perm): @@ -438,9 +438,9 @@ class UserModel(BaseModel): user = self._get_user(user) perm = self._get_perm(perm) # if this permission is already granted skip it - _perm = UserToPerm.query()\ - .filter(UserToPerm.user == user)\ - .filter(UserToPerm.permission == perm)\ + _perm = UserToPerm.query() \ + .filter(UserToPerm.user == user) \ + .filter(UserToPerm.permission == perm) \ .scalar() if _perm: return diff --git a/kallithea/model/user_group.py b/kallithea/model/user_group.py --- a/kallithea/model/user_group.py +++ b/kallithea/model/user_group.py @@ -28,10 +28,10 @@ import logging import traceback from kallithea.model import BaseModel -from kallithea.model.db import UserGroupMember, UserGroup,\ - UserGroupRepoToPerm, Permission, UserGroupToPerm, User, UserUserGroupToPerm,\ +from kallithea.model.db import UserGroupMember, UserGroup, \ + UserGroupRepoToPerm, Permission, UserGroupToPerm, User, UserUserGroupToPerm, \ UserGroupUserGroupToPerm -from kallithea.lib.exceptions import UserGroupsAssignedException,\ +from kallithea.lib.exceptions import UserGroupsAssignedException, \ RepoGroupAssignmentError log = logging.getLogger(__name__) @@ -162,7 +162,7 @@ class UserGroupModel(BaseModel): user_group = self._get_user_group(user_group) try: # check if this group is not assigned to repo - assigned_groups = UserGroupRepoToPerm.query()\ + assigned_groups = UserGroupRepoToPerm.query() \ .filter(UserGroupRepoToPerm.users_group == user_group).all() assigned_groups = [x.repository.repo_name for x in assigned_groups] @@ -224,8 +224,8 @@ class UserGroupModel(BaseModel): user_group = self._get_user_group(user_group) perm = self._get_perm(perm) - return UserGroupToPerm.query()\ - .filter(UserGroupToPerm.users_group == user_group)\ + return UserGroupToPerm.query() \ + .filter(UserGroupToPerm.users_group == user_group) \ .filter(UserGroupToPerm.permission == perm).scalar() is not None def grant_perm(self, user_group, perm): @@ -233,9 +233,9 @@ class UserGroupModel(BaseModel): perm = self._get_perm(perm) # if this permission is already granted skip it - _perm = UserGroupToPerm.query()\ - .filter(UserGroupToPerm.users_group == user_group)\ - .filter(UserGroupToPerm.permission == perm)\ + _perm = UserGroupToPerm.query() \ + .filter(UserGroupToPerm.users_group == user_group) \ + .filter(UserGroupToPerm.permission == perm) \ .scalar() if _perm: return @@ -250,8 +250,8 @@ class UserGroupModel(BaseModel): user_group = self._get_user_group(user_group) perm = self._get_perm(perm) - obj = UserGroupToPerm.query()\ - .filter(UserGroupToPerm.users_group == user_group)\ + obj = UserGroupToPerm.query() \ + .filter(UserGroupToPerm.users_group == user_group) \ .filter(UserGroupToPerm.permission == perm).scalar() if obj is not None: self.sa.delete(obj) @@ -272,9 +272,9 @@ class UserGroupModel(BaseModel): permission = self._get_perm(perm) # check if we have that permission already - obj = self.sa.query(UserUserGroupToPerm)\ - .filter(UserUserGroupToPerm.user == user)\ - .filter(UserUserGroupToPerm.user_group == user_group)\ + obj = self.sa.query(UserUserGroupToPerm) \ + .filter(UserUserGroupToPerm.user == user) \ + .filter(UserUserGroupToPerm.user_group == user_group) \ .scalar() if obj is None: # create new ! @@ -298,9 +298,9 @@ class UserGroupModel(BaseModel): user_group = self._get_user_group(user_group) user = self._get_user(user) - obj = self.sa.query(UserUserGroupToPerm)\ - .filter(UserUserGroupToPerm.user == user)\ - .filter(UserUserGroupToPerm.user_group == user_group)\ + obj = self.sa.query(UserUserGroupToPerm) \ + .filter(UserUserGroupToPerm.user == user) \ + .filter(UserUserGroupToPerm.user_group == user_group) \ .scalar() if obj is not None: self.sa.delete(obj) @@ -323,9 +323,9 @@ class UserGroupModel(BaseModel): 'assigned to itself' % target_user_group) # check if we have that permission already - obj = self.sa.query(UserGroupUserGroupToPerm)\ - .filter(UserGroupUserGroupToPerm.target_user_group == target_user_group)\ - .filter(UserGroupUserGroupToPerm.user_group == user_group)\ + obj = self.sa.query(UserGroupUserGroupToPerm) \ + .filter(UserGroupUserGroupToPerm.target_user_group == target_user_group) \ + .filter(UserGroupUserGroupToPerm.user_group == user_group) \ .scalar() if obj is None: # create new ! @@ -347,9 +347,9 @@ class UserGroupModel(BaseModel): target_user_group = self._get_user_group(target_user_group) user_group = self._get_user_group(user_group) - obj = self.sa.query(UserGroupUserGroupToPerm)\ - .filter(UserGroupUserGroupToPerm.target_user_group == target_user_group)\ - .filter(UserGroupUserGroupToPerm.user_group == user_group)\ + obj = self.sa.query(UserGroupUserGroupToPerm) \ + .filter(UserGroupUserGroupToPerm.target_user_group == target_user_group) \ + .filter(UserGroupUserGroupToPerm.user_group == user_group) \ .scalar() if obj is not None: self.sa.delete(obj) diff --git a/kallithea/model/validators.py b/kallithea/model/validators.py --- a/kallithea/model/validators.py +++ b/kallithea/model/validators.py @@ -136,7 +136,7 @@ def ValidRepoUser(): def validate_python(self, value, state): try: - User.query().filter(User.active == True)\ + User.query().filter(User.active == True) \ .filter(User.username == value).one() except sqlalchemy.exc.InvalidRequestError: # NoResultFound/MultipleResultsFound msg = M(self, 'invalid_username', state, username=value) @@ -226,9 +226,9 @@ def ValidRepoGroup(edit=False, old_data= if old_gname != group_name or not edit: # check group - gr = RepoGroup.query()\ - .filter(RepoGroup.group_name == slug)\ - .filter(RepoGroup.group_parent_id == group_parent_id)\ + gr = RepoGroup.query() \ + .filter(RepoGroup.group_name == slug) \ + .filter(RepoGroup.group_parent_id == group_parent_id) \ .scalar() if gr is not None: @@ -238,8 +238,8 @@ def ValidRepoGroup(edit=False, old_data= ) # check for same repo - repo = Repository.query()\ - .filter(Repository.repo_name == slug)\ + repo = Repository.query() \ + .filter(Repository.repo_name == slug) \ .scalar() if repo is not None: @@ -651,12 +651,12 @@ def ValidPerms(type_='repo'): for k, v, t in perms_new: try: if t is 'user': - self.user_db = User.query()\ - .filter(User.active == True)\ + self.user_db = User.query() \ + .filter(User.active == True) \ .filter(User.username == k).one() if t is 'users_group': - self.user_db = UserGroup.query()\ - .filter(UserGroup.users_group_active == True)\ + self.user_db = UserGroup.query() \ + .filter(UserGroup.users_group_active == True) \ .filter(UserGroup.users_group_name == k).one() except Exception: diff --git a/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html b/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html --- a/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html +++ b/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html @@ -75,7 +75,7 @@ ${h.form(url('edit_repo_group_perms', gr %endfor <% - _tmpl = h.literal("""' \ + _tmpl = h.literal("""'\ \ \ \ diff --git a/kallithea/templates/admin/repos/repo_edit_permissions.html b/kallithea/templates/admin/repos/repo_edit_permissions.html --- a/kallithea/templates/admin/repos/repo_edit_permissions.html +++ b/kallithea/templates/admin/repos/repo_edit_permissions.html @@ -72,7 +72,7 @@ ${h.form(url('edit_repo_perms_update', r %endfor <% - _tmpl = h.literal("""' \ + _tmpl = h.literal("""'\ \ \ \ diff --git a/kallithea/templates/admin/user_groups/user_group_edit_perms.html b/kallithea/templates/admin/user_groups/user_group_edit_perms.html --- a/kallithea/templates/admin/user_groups/user_group_edit_perms.html +++ b/kallithea/templates/admin/user_groups/user_group_edit_perms.html @@ -75,7 +75,7 @@ ${h.form(url('edit_user_group_perms', id %endfor <% - _tmpl = h.literal("""' \ + _tmpl = h.literal("""'\ \ \ \ diff --git a/kallithea/tests/functional/test_admin_repos.py b/kallithea/tests/functional/test_admin_repos.py --- a/kallithea/tests/functional/test_admin_repos.py +++ b/kallithea/tests/functional/test_admin_repos.py @@ -5,7 +5,7 @@ import mock import urllib from kallithea.lib import vcs -from kallithea.model.db import Repository, RepoGroup, UserRepoToPerm, User,\ +from kallithea.model.db import Repository, RepoGroup, UserRepoToPerm, User, \ Permission from kallithea.model.user import UserModel from kallithea.tests import * @@ -18,10 +18,10 @@ fixture = Fixture() def _get_permission_for_user(user, repo): - perm = UserRepoToPerm.query()\ + perm = UserRepoToPerm.query() \ .filter(UserRepoToPerm.repository == - Repository.get_by_repo_name(repo))\ - .filter(UserRepoToPerm.user == User.get_by_username(user))\ + Repository.get_by_repo_name(repo)) \ + .filter(UserRepoToPerm.user == User.get_by_username(user)) \ .all() return perm @@ -66,7 +66,7 @@ class _BaseTest(object): % (repo_name, repo_name)) # test if the repo was created in the database - new_repo = Session().query(Repository)\ + new_repo = Session().query(Repository) \ .filter(Repository.repo_name == repo_name).one() self.assertEqual(new_repo.repo_name, repo_name) @@ -106,7 +106,7 @@ class _BaseTest(object): u'Created repository %s' % (urllib.quote(repo_name), repo_name_unicode)) # test if the repo was created in the database - new_repo = Session().query(Repository)\ + new_repo = Session().query(Repository) \ .filter(Repository.repo_name == repo_name_unicode).one() self.assertEqual(new_repo.repo_name, repo_name_unicode) @@ -150,7 +150,7 @@ class _BaseTest(object): 'Created repository %s' % (repo_name_full, repo_name_full)) # test if the repo was created in the database - new_repo = Session().query(Repository)\ + new_repo = Session().query(Repository) \ .filter(Repository.repo_name == repo_name_full).one() new_repo_id = new_repo.repo_id @@ -162,7 +162,7 @@ class _BaseTest(object): response.mustcontain(repo_name_full) response.mustcontain(self.REPO_TYPE) - inherited_perms = UserRepoToPerm.query()\ + inherited_perms = UserRepoToPerm.query() \ .filter(UserRepoToPerm.repository_id == new_repo_id).all() self.assertEqual(len(inherited_perms), 1) @@ -242,7 +242,7 @@ class _BaseTest(object): 'Created repository %s' % (repo_name_full, repo_name_full)) # test if the repo was created in the database - new_repo = Session().query(Repository)\ + new_repo = Session().query(Repository) \ .filter(Repository.repo_name == repo_name_full).one() new_repo_id = new_repo.repo_id @@ -254,7 +254,7 @@ class _BaseTest(object): response.mustcontain(repo_name_full) response.mustcontain(self.REPO_TYPE) - inherited_perms = UserRepoToPerm.query()\ + inherited_perms = UserRepoToPerm.query() \ .filter(UserRepoToPerm.repository_id == new_repo_id).all() self.assertEqual(len(inherited_perms), 1) @@ -303,7 +303,7 @@ class _BaseTest(object): 'Created repository %s' % (repo_name_full, repo_name_full)) # test if the repo was created in the database - new_repo = Session().query(Repository)\ + new_repo = Session().query(Repository) \ .filter(Repository.repo_name == repo_name_full).one() new_repo_id = new_repo.repo_id @@ -324,7 +324,7 @@ class _BaseTest(object): self.fail('no repo %s in filesystem' % repo_name) #check if inherited permissiona are applied - inherited_perms = UserRepoToPerm.query()\ + inherited_perms = UserRepoToPerm.query() \ .filter(UserRepoToPerm.repository_id == new_repo_id).all() self.assertEqual(len(inherited_perms), 2) @@ -381,7 +381,7 @@ class _BaseTest(object): 'Created repository %s' % (repo_name, repo_name)) # test if the repo was created in the database - new_repo = Session().query(Repository)\ + new_repo = Session().query(Repository) \ .filter(Repository.repo_name == repo_name).one() self.assertEqual(new_repo.repo_name, repo_name) @@ -406,7 +406,7 @@ class _BaseTest(object): response.follow() #check if repo was deleted from db - deleted_repo = Session().query(Repository)\ + deleted_repo = Session().query(Repository) \ .filter(Repository.repo_name == repo_name).scalar() self.assertEqual(deleted_repo, None) @@ -434,7 +434,7 @@ class _BaseTest(object): u'Created repository %s' % (urllib.quote(repo_name), repo_name_unicode)) # test if the repo was created in the database - new_repo = Session().query(Repository)\ + new_repo = Session().query(Repository) \ .filter(Repository.repo_name == repo_name_unicode).one() self.assertEqual(new_repo.repo_name, repo_name_unicode) @@ -457,7 +457,7 @@ class _BaseTest(object): response.follow() #check if repo was deleted from db - deleted_repo = Session().query(Repository)\ + deleted_repo = Session().query(Repository) \ .filter(Repository.repo_name == repo_name_unicode).scalar() self.assertEqual(deleted_repo, None) diff --git a/kallithea/tests/functional/test_admin_user_groups.py b/kallithea/tests/functional/test_admin_user_groups.py --- a/kallithea/tests/functional/test_admin_user_groups.py +++ b/kallithea/tests/functional/test_admin_user_groups.py @@ -51,13 +51,13 @@ class TestAdminUsersGroupsController(Tes self.checkSessionFlash(response, 'Created user group ') - gr = Session().query(UserGroup)\ + gr = Session().query(UserGroup) \ .filter(UserGroup.users_group_name == users_group_name).one() response = self.app.post(url('users_group', id=gr.users_group_id), params={'_method': 'delete', '_authentication_token': self.authentication_token()}) - gr = Session().query(UserGroup)\ + gr = Session().query(UserGroup) \ .filter(UserGroup.users_group_name == users_group_name).scalar() self.assertEqual(gr, None) @@ -87,7 +87,7 @@ class TestAdminUsersGroupsController(Tes p3 = Permission.get_by_key('hg.fork.none') # check if user has this perms, they should be here since # defaults are on - perms = UserGroupToPerm.query()\ + perms = UserGroupToPerm.query() \ .filter(UserGroupToPerm.users_group == ug).all() self.assertEqual( @@ -109,7 +109,7 @@ class TestAdminUsersGroupsController(Tes # check if user has this perms, they should be here since # defaults are on - perms = UserGroupToPerm.query()\ + perms = UserGroupToPerm.query() \ .filter(UserGroupToPerm.users_group == ug).all() self.assertEqual( @@ -124,12 +124,12 @@ class TestAdminUsersGroupsController(Tes response = self.app.post(url('users_group', id=ug.users_group_id), params={'_method': 'delete', '_authentication_token': self.authentication_token()}) response = response.follow() - gr = Session().query(UserGroup)\ + gr = Session().query(UserGroup) \ .filter(UserGroup.users_group_name == users_group_name).scalar() self.assertEqual(gr, None) p = Permission.get_by_key('hg.create.repository') - perms = UserGroupToPerm.query()\ + perms = UserGroupToPerm.query() \ .filter(UserGroupToPerm.users_group_id == ugid).all() perms = [[x.users_group_id, x.permission_id, ] for x in perms] @@ -160,7 +160,7 @@ class TestAdminUsersGroupsController(Tes p3 = Permission.get_by_key('hg.fork.repository') # check if user has this perms, they should be here since # defaults are on - perms = UserGroupToPerm.query()\ + perms = UserGroupToPerm.query() \ .filter(UserGroupToPerm.users_group == ug).all() self.assertEqual( @@ -180,7 +180,7 @@ class TestAdminUsersGroupsController(Tes p3 = Permission.get_by_key('hg.fork.none') # check if user has this perms, they should be here since # defaults are on - perms = UserGroupToPerm.query()\ + perms = UserGroupToPerm.query() \ .filter(UserGroupToPerm.users_group == ug).all() self.assertEqual( @@ -195,13 +195,13 @@ class TestAdminUsersGroupsController(Tes response = self.app.post(url('users_group', id=ug.users_group_id), params={'_method': 'delete', '_authentication_token': self.authentication_token()}) response = response.follow() - gr = Session().query(UserGroup)\ + gr = Session().query(UserGroup) \ .filter(UserGroup.users_group_name == users_group_name).scalar() self.assertEqual(gr, None) p = Permission.get_by_key('hg.fork.repository') - perms = UserGroupToPerm.query()\ + perms = UserGroupToPerm.query() \ .filter(UserGroupToPerm.users_group_id == ugid).all() perms = [[x.users_group_id, x.permission_id, ] for x in perms] diff --git a/kallithea/tests/functional/test_admin_users.py b/kallithea/tests/functional/test_admin_users.py --- a/kallithea/tests/functional/test_admin_users.py +++ b/kallithea/tests/functional/test_admin_users.py @@ -64,7 +64,7 @@ class TestAdminUsersController(TestContr self.checkSessionFlash(response, '''Created user %s''' % (username)) - new_user = Session().query(User).\ + new_user = Session().query(User). \ filter(User.username == username).one() self.assertEqual(new_user.username, username) @@ -165,7 +165,7 @@ class TestAdminUsersController(TestContr fixture.create_user(name=username) - new_user = Session().query(User)\ + new_user = Session().query(User) \ .filter(User.username == username).one() response = self.app.post(url('user', id=new_user.user_id), params={'_method': 'delete', '_authentication_token': self.authentication_token()}) @@ -180,7 +180,7 @@ class TestAdminUsersController(TestContr fixture.create_user(name=username) fixture.create_repo(name=reponame, cur_user=username) - new_user = Session().query(User)\ + new_user = Session().query(User) \ .filter(User.username == username).one() response = self.app.post(url('user', id=new_user.user_id), params={'_method': 'delete', '_authentication_token': self.authentication_token()}) @@ -205,7 +205,7 @@ class TestAdminUsersController(TestContr fixture.create_user(name=username) fixture.create_repo_group(name=groupname, cur_user=username) - new_user = Session().query(User)\ + new_user = Session().query(User) \ .filter(User.username == username).one() response = self.app.post(url('user', id=new_user.user_id), params={'_method': 'delete', '_authentication_token': self.authentication_token()}) @@ -234,7 +234,7 @@ class TestAdminUsersController(TestContr fixture.create_user(name=username) ug = fixture.create_user_group(name=groupname, cur_user=username) - new_user = Session().query(User)\ + new_user = Session().query(User) \ .filter(User.username == username).one() response = self.app.post(url('user', id=new_user.user_id), params={'_method': 'delete', '_authentication_token': self.authentication_token()}) diff --git a/kallithea/tests/functional/test_forks.py b/kallithea/tests/functional/test_forks.py --- a/kallithea/tests/functional/test_forks.py +++ b/kallithea/tests/functional/test_forks.py @@ -130,7 +130,7 @@ class _BaseTestCase(object): % (repo_name, fork_name_full, fork_name_full)) #test if the fork was created in the database - fork_repo = Session().query(Repository)\ + fork_repo = Session().query(Repository) \ .filter(Repository.repo_name == fork_name_full).one() self.assertEqual(fork_repo.repo_name, fork_name_full) @@ -173,7 +173,7 @@ class _BaseTestCase(object): % (repo_name, fork_name, fork_name)) #test if the fork was created in the database - fork_repo = Session().query(Repository)\ + fork_repo = Session().query(Repository) \ .filter(Repository.repo_name == fork_name).one() self.assertEqual(fork_repo.repo_name, fork_name) @@ -189,8 +189,8 @@ class _BaseTestCase(object): usr = self.log_user(self.username, self.password)['user_id'] repo_name = self.REPO - forks = Repository.query()\ - .filter(Repository.repo_type == self.REPO_TYPE)\ + forks = Repository.query() \ + .filter(Repository.repo_type == self.REPO_TYPE) \ .filter(Repository.fork_id != None).all() self.assertEqual(1, len(forks)) @@ -209,8 +209,8 @@ class _BaseTestCase(object): usr = self.log_user(self.username, self.password)['user_id'] repo_name = self.REPO - forks = Repository.query()\ - .filter(Repository.repo_type == self.REPO_TYPE)\ + forks = Repository.query() \ + .filter(Repository.repo_type == self.REPO_TYPE) \ .filter(Repository.fork_id != None).all() self.assertEqual(1, len(forks)) diff --git a/kallithea/tests/functional/test_journal.py b/kallithea/tests/functional/test_journal.py --- a/kallithea/tests/functional/test_journal.py +++ b/kallithea/tests/functional/test_journal.py @@ -15,8 +15,8 @@ class TestJournalController(TestControll # usr = Session().query(User).filter(User.username == TEST_USER_ADMIN_LOGIN).one() # repo = Session().query(Repository).filter(Repository.repo_name == HG_REPO).one() # -# followings = Session().query(UserFollowing)\ -# .filter(UserFollowing.user == usr)\ +# followings = Session().query(UserFollowing) \ +# .filter(UserFollowing.user == usr) \ # .filter(UserFollowing.follows_repository == repo).all() # # assert len(followings) == 1, 'Not following any repository' diff --git a/kallithea/tests/functional/test_my_account.py b/kallithea/tests/functional/test_my_account.py --- a/kallithea/tests/functional/test_my_account.py +++ b/kallithea/tests/functional/test_my_account.py @@ -72,8 +72,8 @@ class TestMyAccountController(TestContro response = self.app.get(url('my_account_emails')) from kallithea.model.db import UserEmailMap - email_id = UserEmailMap.query()\ - .filter(UserEmailMap.user == User.get_by_username(TEST_USER_ADMIN_LOGIN))\ + email_id = UserEmailMap.query() \ + .filter(UserEmailMap.user == User.get_by_username(TEST_USER_ADMIN_LOGIN)) \ .filter(UserEmailMap.email == 'barz@example.com').one().email_id response.mustcontain('barz@example.com') @@ -180,7 +180,7 @@ class TestMyAccountController(TestContro response.mustcontain('An email address must contain a single @') from kallithea.model import validators - msg = validators.ValidUsername(edit=False, old_data={})\ + msg = validators.ValidUsername(edit=False, old_data={}) \ ._messages['username_exists'] msg = h.html_escape(msg % {'username': TEST_USER_ADMIN_LOGIN}) response.mustcontain(msg) diff --git a/kallithea/tests/models/test_notifications.py b/kallithea/tests/models/test_notifications.py --- a/kallithea/tests/models/test_notifications.py +++ b/kallithea/tests/models/test_notifications.py @@ -55,7 +55,7 @@ class TestNotifications(BaseTestCase): self.assertEqual(notification.notification_id, notifications[0].notification_id) - unotification = UserNotification.query()\ + unotification = UserNotification.query() \ .filter(UserNotification.notification == notification).all() self.assertEqual(len(unotification), len(usrs)) @@ -100,10 +100,10 @@ class TestNotifications(BaseTestCase): recipients=[self.u3, self.u1, self.u2]) Session().commit() - unotification = UserNotification.query()\ + unotification = UserNotification.query() \ .filter(UserNotification.notification == - notification)\ - .filter(UserNotification.user_id == self.u3)\ + notification) \ + .filter(UserNotification.user_id == self.u3) \ .scalar() self.assertEqual(unotification.user_id, self.u3) @@ -112,10 +112,10 @@ class TestNotifications(BaseTestCase): notification.notification_id) Session().commit() - u3notification = UserNotification.query()\ + u3notification = UserNotification.query() \ .filter(UserNotification.notification == - notification)\ - .filter(UserNotification.user_id == self.u3)\ + notification) \ + .filter(UserNotification.user_id == self.u3) \ .scalar() self.assertEqual(u3notification, None) @@ -124,16 +124,16 @@ class TestNotifications(BaseTestCase): self.assertEqual(Notification.query().all(), [notification]) #u1 and u2 still have assignments - u1notification = UserNotification.query()\ + u1notification = UserNotification.query() \ .filter(UserNotification.notification == - notification)\ - .filter(UserNotification.user_id == self.u1)\ + notification) \ + .filter(UserNotification.user_id == self.u1) \ .scalar() self.assertNotEqual(u1notification, None) - u2notification = UserNotification.query()\ + u2notification = UserNotification.query() \ .filter(UserNotification.notification == - notification)\ - .filter(UserNotification.user_id == self.u2)\ + notification) \ + .filter(UserNotification.user_id == self.u2) \ .scalar() self.assertNotEqual(u2notification, None) diff --git a/kallithea/tests/models/test_permissions.py b/kallithea/tests/models/test_permissions.py --- a/kallithea/tests/models/test_permissions.py +++ b/kallithea/tests/models/test_permissions.py @@ -2,7 +2,7 @@ from kallithea.tests import * from kallithea.tests.fixture import Fixture from kallithea.model.repo_group import RepoGroupModel from kallithea.model.repo import RepoModel -from kallithea.model.db import RepoGroup, User, UserGroupRepoGroupToPerm,\ +from kallithea.model.db import RepoGroup, User, UserGroupRepoGroupToPerm, \ Permission, UserToPerm from kallithea.model.user import UserModel @@ -325,9 +325,9 @@ class TestPermissions(BaseTestCase): perm='group.read') Session().commit() # check if the - obj = Session().query(UserGroupRepoGroupToPerm)\ - .filter(UserGroupRepoGroupToPerm.group == self.g1)\ - .filter(UserGroupRepoGroupToPerm.users_group == self.ug1)\ + obj = Session().query(UserGroupRepoGroupToPerm) \ + .filter(UserGroupRepoGroupToPerm.group == self.g1) \ + .filter(UserGroupRepoGroupToPerm.users_group == self.ug1) \ .scalar() self.assertEqual(obj.permission.permission_name, 'group.read') @@ -689,8 +689,8 @@ class TestPermissions(BaseTestCase): 'repository.admin') def _test_def_perm_equal(self, user, change_factor=0): - perms = UserToPerm.query()\ - .filter(UserToPerm.user == user)\ + perms = UserToPerm.query() \ + .filter(UserToPerm.user == user) \ .all() self.assertEqual(len(perms), len(Permission.DEFAULT_USER_PERMISSIONS,)+change_factor, @@ -704,8 +704,8 @@ class TestPermissions(BaseTestCase): PermissionModel().create_default_permissions(user=self.u1) self._test_def_perm_equal(user=self.u1) #now we delete one, it should be re-created after another call - perms = UserToPerm.query()\ - .filter(UserToPerm.user == self.u1)\ + perms = UserToPerm.query() \ + .filter(UserToPerm.user == self.u1) \ .all() Session().delete(perms[0]) Session().commit() @@ -734,9 +734,9 @@ class TestPermissions(BaseTestCase): self.assertNotEqual(new, None) #now modify permissions - p = UserToPerm.query()\ - .filter(UserToPerm.user == self.u1)\ - .filter(UserToPerm.permission == old)\ + p = UserToPerm.query() \ + .filter(UserToPerm.user == self.u1) \ + .filter(UserToPerm.permission == old) \ .one() p.permission = new Session().add(p) diff --git a/kallithea/tests/models/test_users.py b/kallithea/tests/models/test_users.py --- a/kallithea/tests/models/test_users.py +++ b/kallithea/tests/models/test_users.py @@ -1,6 +1,6 @@ from kallithea.tests import * -from kallithea.model.db import User, UserGroup, UserGroupMember, UserEmailMap,\ +from kallithea.model.db import User, UserGroup, UserGroupMember, UserEmailMap, \ Permission from kallithea.model.user import UserModel diff --git a/kallithea/tests/vcs/test_git.py b/kallithea/tests/vcs/test_git.py --- a/kallithea/tests/vcs/test_git.py +++ b/kallithea/tests/vcs/test_git.py @@ -303,8 +303,8 @@ class GitChangesetTest(unittest.TestCase self.assertTrue(api is chset.get_node('docs/api')) index = api.get_node('index.rst') self.assertTrue(index is chset.get_node('docs/api/index.rst')) - self.assertTrue(index is chset.get_node('docs')\ - .get_node('api')\ + self.assertTrue(index is chset.get_node('docs') \ + .get_node('api') \ .get_node('index.rst')) def test_branch_and_tags(self): @@ -535,8 +535,8 @@ class GitChangesetTest(unittest.TestCase """ Tests state of FileNodes. """ - node = self.repo\ - .get_changeset('e6ea6d16e2f26250124a1f4b4fe37a912f9d86a0')\ + node = self.repo \ + .get_changeset('e6ea6d16e2f26250124a1f4b4fe37a912f9d86a0') \ .get_node('vcs/utils/diffs.py') self.assertTrue(node.state, NodeState.ADDED) self.assertTrue(node.added) @@ -544,8 +544,8 @@ class GitChangesetTest(unittest.TestCase self.assertFalse(node.not_changed) self.assertFalse(node.removed) - node = self.repo\ - .get_changeset('33fa3223355104431402a888fa77a4e9956feb3e')\ + node = self.repo \ + .get_changeset('33fa3223355104431402a888fa77a4e9956feb3e') \ .get_node('.hgignore') self.assertTrue(node.state, NodeState.CHANGED) self.assertFalse(node.added) @@ -553,8 +553,8 @@ class GitChangesetTest(unittest.TestCase self.assertFalse(node.not_changed) self.assertFalse(node.removed) - node = self.repo\ - .get_changeset('e29b67bd158580fc90fc5e9111240b90e6e86064')\ + node = self.repo \ + .get_changeset('e29b67bd158580fc90fc5e9111240b90e6e86064') \ .get_node('setup.py') self.assertTrue(node.state, NodeState.NOT_CHANGED) self.assertFalse(node.added) @@ -599,24 +599,24 @@ class GitChangesetTest(unittest.TestCase def test_author_email(self): self.assertEqual('marcin@python-blog.com', - self.repo.get_changeset('c1214f7e79e02fc37156ff215cd71275450cffc3')\ + self.repo.get_changeset('c1214f7e79e02fc37156ff215cd71275450cffc3') \ .author_email) self.assertEqual('lukasz.balcerzak@python-center.pl', - self.repo.get_changeset('ff7ca51e58c505fec0dd2491de52c622bb7a806b')\ + self.repo.get_changeset('ff7ca51e58c505fec0dd2491de52c622bb7a806b') \ .author_email) self.assertEqual('none@none', - self.repo.get_changeset('8430a588b43b5d6da365400117c89400326e7992')\ + self.repo.get_changeset('8430a588b43b5d6da365400117c89400326e7992') \ .author_email) def test_author_username(self): self.assertEqual('Marcin Kuzminski', - self.repo.get_changeset('c1214f7e79e02fc37156ff215cd71275450cffc3')\ + self.repo.get_changeset('c1214f7e79e02fc37156ff215cd71275450cffc3') \ .author_name) self.assertEqual('Lukasz Balcerzak', - self.repo.get_changeset('ff7ca51e58c505fec0dd2491de52c622bb7a806b')\ + self.repo.get_changeset('ff7ca51e58c505fec0dd2491de52c622bb7a806b') \ .author_name) self.assertEqual('marcink', - self.repo.get_changeset('8430a588b43b5d6da365400117c89400326e7992')\ + self.repo.get_changeset('8430a588b43b5d6da365400117c89400326e7992') \ .author_name) diff --git a/kallithea/tests/vcs/test_hg.py b/kallithea/tests/vcs/test_hg.py --- a/kallithea/tests/vcs/test_hg.py +++ b/kallithea/tests/vcs/test_hg.py @@ -302,8 +302,8 @@ class MercurialChangesetTest(unittest.Te self.assertTrue(api is chset.get_node('docs/api')) index = api.get_node('index.rst') self.assertTrue(index is chset.get_node('docs/api/index.rst')) - self.assertTrue(index is chset.get_node('docs')\ - .get_node('api')\ + self.assertTrue(index is chset.get_node('docs') \ + .get_node('api') \ .get_node('index.rst')) def test_branch_and_tags(self): diff --git a/scripts/whitespacecleanup.sh b/scripts/whitespacecleanup.sh --- a/scripts/whitespacecleanup.sh +++ b/scripts/whitespacecleanup.sh @@ -6,6 +6,7 @@ files=`hg loc '*.py' '*.html' '*.css' '* sed -i -e "s,`printf '\t'`, ,g" $files sed -i -e "s, *$,,g" $files +sed -i -e 's,\([^ ]\)\\$,\1 \\,g' -e 's,\(["'"'"']["'"'"']["'"'"']\) \\$,\1\\,g' $files # ensure one trailing newline - remove empty last line and make last line include trailing newline: sed -i -e '$,${/^$/d}' -e '$a\' $files