diff --git a/pagure/ui/admin.py b/pagure/ui/admin.py index 776f299..e458051 100644 --- a/pagure/ui/admin.py +++ b/pagure/ui/admin.py @@ -1,17 +1,20 @@ # -*- coding: utf-8 -*- """ - (c) 2014-2015 - Copyright Red Hat Inc + (c) 2014-2016 - Copyright Red Hat Inc Authors: Pierre-Yves Chibon """ +# no-member +# pylint: disable=E1101 + + from functools import wraps import flask -from sqlalchemy.exc import SQLAlchemyError import pagure.exceptions import pagure.forms @@ -20,8 +23,6 @@ import pagure.lib.git from pagure import (APP, SESSION, generate_user_key_files, is_admin, admin_session_timedout) -# pylint: disable=E1101 - def admin_required(function): """ Flask decorator to retrict access to admins of pagure. diff --git a/pagure/ui/app.py b/pagure/ui/app.py index 17475fb..58133fa 100644 --- a/pagure/ui/app.py +++ b/pagure/ui/app.py @@ -84,7 +84,7 @@ def index_auth(): try: repopage = int(repopage) if repopage < 1: - page = 1 + repopage = 1 except ValueError: repopage = 1 @@ -92,7 +92,7 @@ def index_auth(): try: forkpage = int(forkpage) if forkpage < 1: - page = 1 + forkpage = 1 except ValueError: forkpage = 1 @@ -381,7 +381,7 @@ def new_project(): create_readme = form.create_readme.data try: - message = pagure.lib.new_project( + pagure.lib.new_project( SESSION, name=name, description=description, diff --git a/pagure/ui/filters.py b/pagure/ui/filters.py index 825c87f..a32c774 100644 --- a/pagure/ui/filters.py +++ b/pagure/ui/filters.py @@ -1,13 +1,21 @@ # -*- coding: utf-8 -*- """ - (c) 2014 - Copyright Red Hat Inc + (c) 2014-2016 - Copyright Red Hat Inc Authors: Pierre-Yves Chibon """ +# too-many-branches +# pylint: disable=R0912 +# too-many-arguments +# pylint: disable=R0913 +# too-many-locals +# pylint: disable=R0914 + + import datetime import textwrap @@ -94,18 +102,19 @@ def format_loc(loc, commit=None, filename=None, tree_id=None, prequest=None, if filename and commit: output.append( '' - '' + '' '' '

' - '' + '' '

' '' % ( { 'cnt': '%s_%s' % (index, cnt), 'cnt_lbl': cnt, - 'img': flask.url_for('static', filename='users.png'), 'filename': filename.decode('UTF-8'), 'commit': commit, 'tree_id': tree_id, @@ -115,7 +124,8 @@ def format_loc(loc, commit=None, filename=None, tree_id=None, prequest=None, else: output.append( '' - '' + '' % ( { 'cnt': '%s_%s' % (index, cnt), @@ -154,27 +164,30 @@ def format_loc(loc, commit=None, filename=None, tree_id=None, prequest=None, templ_delete = '' templ_edit = '' templ_edited = '' + status = str(comment.parent.status).lower() if authenticated() and ( - (str(comment.parent.status).lower() in ['true', 'open'] - and comment.user.user == flask.g.fas_user.username) - or is_repo_admin(comment.parent.project)): + ( + status in ['true', 'open'] + and comment.user.user == flask.g.fas_user.username + ) + or is_repo_admin(comment.parent.project)): templ_delete = tpl_delete % ({'commentid': comment.id}) - templ_edit = tpl_edit %({ + templ_edit = tpl_edit % ({ 'edit_url': flask.url_for( 'pull_request_edit_comment', repo=comment.parent.project.name, requestid=comment.parent.id, commentid=comment.id, - username=comment.parent.user.user \ - if comment.parent.project.is_fork else None + username=comment.parent.user.user + if comment.parent.project.is_fork else None ), 'requestid': comment.parent.id, 'commentid': comment.id, }) if comment.edited_on: - templ_edited = tpl_edited %({ - 'edit_date':comment.edited_on.strftime( + templ_edited = tpl_edited % ({ + 'edit_date': comment.edited_on.strftime( '%b %d %Y %H:%M:%S'), 'human_edit_date': humanize_date(comment.edited_on), 'user': comment.editor.user, @@ -199,7 +212,8 @@ def format_loc(loc, commit=None, filename=None, tree_id=None, prequest=None, '' '
' '%(templ_edited)s' - '