# HG changeset patch # User Mads Kiilerich # Date 2019-08-04 01:20:49 # Node ID 5f5f3e93383da34950463d038710cde45ebb9e04 # Parent 63b548dd5ef3deca4168cb37ddb05eca2abd3597 flake8: fix E502 the backslash is redundant between brackets diff --git a/kallithea/lib/page.py b/kallithea/lib/page.py --- a/kallithea/lib/page.py +++ b/kallithea/lib/page.py @@ -154,15 +154,15 @@ class Page(_Page): 'first_item': self.first_item, 'last_item': self.last_item, 'item_count': self.item_count, - 'link_first': self.page > self.first_page and \ + 'link_first': self.page > self.first_page and self._pagerlink(self.first_page, symbol_first) or '', - 'link_last': self.page < self.last_page and \ + 'link_last': self.page < self.last_page and self._pagerlink(self.last_page, symbol_last) or '', - 'link_previous': HTML.li(self.previous_page and \ - self._pagerlink(self.previous_page, symbol_previous) \ + 'link_previous': HTML.li(self.previous_page and + self._pagerlink(self.previous_page, symbol_previous) or HTML.a(symbol_previous)), - 'link_next': HTML.li(self.next_page and \ - self._pagerlink(self.next_page, symbol_next) \ + 'link_next': HTML.li(self.next_page and + self._pagerlink(self.next_page, symbol_next) or HTML.a(symbol_next)) }) diff --git a/kallithea/model/comment.py b/kallithea/model/comment.py --- a/kallithea/model/comment.py +++ b/kallithea/model/comment.py @@ -82,7 +82,7 @@ class ChangesetCommentsModel(object): revision=revision, anchor='comment-%s' % comment.comment_id) subj = safe_unicode( - h.link_to('Re changeset: %(desc)s %(line)s' % \ + h.link_to('Re changeset: %(desc)s %(line)s' % {'desc': desc, 'line': line}, comment_url) ) 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 @@ -70,7 +70,7 @@ class PullRequestModel(object): h.canonical_hostname())] subject = safe_unicode( h.link_to( - _('%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s') % \ + _('%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s') % {'user': user.username, 'pr_title': pr.title, 'pr_nice_id': pr.nice_id()}, 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 @@ -307,14 +307,14 @@ class RepoGroupModel(object): # set the value from it's parent if isinstance(obj, RepoGroup): new_name = obj.get_new_name(obj.name) - log.debug('Fixing group %s to new name %s' \ + log.debug('Fixing group %s to new name %s' % (obj.group_name, new_name)) obj.group_name = new_name elif isinstance(obj, Repository): # we need to get all repositories from this new group and # rename them accordingly to new group path new_name = obj.get_new_name(obj.just_name) - log.debug('Fixing repo %s to new name %s' \ + log.debug('Fixing repo %s to new name %s' % (obj.repo_name, new_name)) obj.repo_name = new_name