From 53e4c2846d3c4269d70d1cf12ef60710f3620240 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Aug 29 2016 09:25:53 +0000 Subject: Finish pep8 and pylint fixes to pagure.ui --- diff --git a/pagure/ui/groups.py b/pagure/ui/groups.py index 2671072..c60caac 100644 --- a/pagure/ui/groups.py +++ b/pagure/ui/groups.py @@ -7,6 +7,8 @@ Pierre-Yves Chibon """ +# no-member +# pylint: disable=E1101 import flask @@ -18,8 +20,6 @@ import pagure.lib import pagure.lib.git -# pylint: disable=E1101 - @pagure.APP.route('/groups/') @pagure.APP.route('/groups') def group_lists(): @@ -54,7 +54,7 @@ def group_lists(): def view_group(group): ''' Displays information about this group. ''' if flask.request.method == 'POST' and \ - not pagure.APP.config.get('ENABLE_USER_MNGT', True): + not pagure.APP.config.get('ENABLE_USER_MNGT', True): flask.abort(404) group_type = 'user' @@ -69,7 +69,7 @@ def view_group(group): # Add new user to the group if asked form = pagure.forms.AddUserForm() if pagure.authenticated() and form.validate_on_submit() \ - and pagure.APP.config.get('ENABLE_GROUP_MNGT', False): + and pagure.APP.config.get('ENABLE_GROUP_MNGT', False): username = form.user.data @@ -293,8 +293,8 @@ def add_group(): try: group_name = form.group_name.data.strip() - display_name=form.display_name.data.strip() - description=form.description.data.strip() + display_name = form.display_name.data.strip() + description = form.description.data.strip() msg = pagure.lib.add_group( session=pagure.SESSION, diff --git a/pagure/ui/issues.py b/pagure/ui/issues.py index 98fd678..6652bab 100644 --- a/pagure/ui/issues.py +++ b/pagure/ui/issues.py @@ -1,13 +1,25 @@ # -*- 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 +# too-many-lines +# pylint: disable=C0302 +# too-many-branches +# pylint: disable=R0912 +# too-many-locals +# pylint: disable=R0914 +# too-many-statements +# pylint: disable=R0915 + + import flask import os from collections import defaultdict @@ -27,8 +39,6 @@ from pagure import (APP, SESSION, LOG, __get_file_in_tree, login_required, is_repo_admin, authenticated) -# pylint: disable=E1101 - # URLs @APP.route('//issue//update/', methods=['GET', 'POST']) @@ -256,8 +266,10 @@ def update_issue(repo, issueid, username=None): @APP.route('//tag//edit/', methods=('GET', 'POST')) @APP.route('//tag//edit', methods=('GET', 'POST')) -@APP.route('/fork///tag//edit/', methods=('GET', 'POST')) -@APP.route('/fork///tag//edit', methods=('GET', 'POST')) +@APP.route( + '/fork///tag//edit/', methods=('GET', 'POST')) +@APP.route( + '/fork///tag//edit', methods=('GET', 'POST')) @login_required def edit_tag(repo, tag, username=None): """ Edit the specified tag associated with the issues of a project. @@ -279,7 +291,7 @@ def edit_tag(repo, tag, username=None): tags = pagure.lib.get_tags_of_project(SESSION, repo) if not tags or tag not in [t.tag for t in tags]: - flask.abort(404, 'Tag %s not found in this project' % tag ) + flask.abort(404, 'Tag %s not found in this project' % tag) form = pagure.forms.AddIssueTagForm() if form.validate_on_submit(): @@ -522,7 +534,7 @@ def view_roadmap(repo, username=None): active = True break if not active: - del(milestone_issues[key]) + del milestone_issues[key] if milestone: for mlstone in milestone: @@ -554,7 +566,6 @@ def view_roadmap(repo, username=None): ) - @APP.route('//new_issue/', methods=('GET', 'POST')) @APP.route('//new_issue', methods=('GET', 'POST')) @APP.route('/fork///new_issue/', methods=('GET', 'POST')) @@ -582,8 +593,9 @@ def new_issue(repo, username=None): SESSION, flask.g.fas_user.username) except pagure.exceptions.PagureException: flask.abort( - 404, 'No such user found in the database: %s' % - flask.g.fas_user.username) + 404, + 'No such user found in the database: %s' % ( + flask.g.fas_user.username)) try: issue = pagure.lib.new_issue( @@ -650,7 +662,7 @@ def new_issue(repo, username=None): bail_on_tree=True) if default_file: default, _ = pagure.doc_utils.convert_readme( - default_file.data, 'md') + default_file.data, 'md') return flask.render_template( 'new_issue.html', @@ -802,8 +814,8 @@ def edit_issue(repo, issueid, username=None): SESSION, flask.g.fas_user.username) except pagure.exceptions.PagureException: flask.abort( - 404, 'No such user found in the database: %s' % - flask.g.fas_user.username) + 404, 'No such user found in the database: %s' % ( + flask.g.fas_user.username)) try: message = pagure.lib.edit_issue( @@ -897,8 +909,8 @@ def upload_issue(repo, issueid, username=None): SESSION, flask.g.fas_user.username) except pagure.exceptions.PagureException: flask.abort( - 404, 'No such user found in the database: %s' % - flask.g.fas_user.username) + 404, 'No such user found in the database: %s' % ( + flask.g.fas_user.username)) form = pagure.forms.UploadFileForm() # pylint: disable=E1101 diff --git a/pagure/ui/login.py b/pagure/ui/login.py index 54f5db1..accbd00 100644 --- a/pagure/ui/login.py +++ b/pagure/ui/login.py @@ -9,11 +9,12 @@ """ +# no-member +# pylint: disable=E1101 + -import hashlib import datetime import urlparse -import bcrypt import flask from sqlalchemy.exc import SQLAlchemyError @@ -26,8 +27,6 @@ import pagure.lib.notify from pagure import APP, SESSION, login_required from pagure.lib.login import generate_hashed_value, check_password -# pylint: disable=E1101 - @APP.route('/user/new/', methods=['GET', 'POST']) @APP.route('/user/new', methods=['GET', 'POST']) @@ -199,9 +198,10 @@ def lost_password(): invalid_period = user_obj.updated_on + \ datetime.timedelta(minutes=3) if current_time < invalid_period: - flask.flash('An email was sent to you less than 3 minutes ago, ' - 'did you check your spam folder? Otherwise, ' - 'try again after some time.', 'error') + flask.flash( + 'An email was sent to you less than 3 minutes ago, ' + 'did you check your spam folder? Otherwise, ' + 'try again after some time.', 'error') return flask.redirect(flask.url_for('auth_login')) token = pagure.lib.login.id_generator(40) diff --git a/pagure/ui/plugins.py b/pagure/ui/plugins.py index cf478c1..14e3c98 100644 --- a/pagure/ui/plugins.py +++ b/pagure/ui/plugins.py @@ -1,13 +1,18 @@ # -*- 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 +# no-member +# pylint: disable=E1101 + import flask from sqlalchemy.exc import SQLAlchemyError @@ -20,12 +25,6 @@ import pagure.forms from pagure import APP, SESSION, login_required, is_repo_admin from pagure.lib.model import BASE from pagure.exceptions import FileNotFoundException -from pagure.lib import model - -import json -from kitchen.text.converters import to_bytes - -# pylint: disable=E1101 def get_plugin_names(blacklist=None): @@ -60,16 +59,24 @@ def get_plugin(plugin_name): @APP.route('//settings//', methods=('GET', 'POST')) @APP.route('//settings/', methods=('GET', 'POST')) -@APP.route('//settings///', methods=('GET', 'POST')) -@APP.route('//settings//', methods=('GET', 'POST')) -@APP.route('/fork///settings//', - methods=('GET', 'POST')) -@APP.route('/fork///settings/', - methods=('GET', 'POST')) -@APP.route('/fork///settings///', - methods=('GET', 'POST')) -@APP.route('/fork///settings//', - methods=('GET', 'POST')) +@APP.route( + '//settings///', + methods=('GET', 'POST')) +@APP.route( + '//settings//', + methods=('GET', 'POST')) +@APP.route( + '/fork///settings//', + methods=('GET', 'POST')) +@APP.route( + '/fork///settings/', + methods=('GET', 'POST')) +@APP.route( + '/fork///settings///', + methods=('GET', 'POST')) +@APP.route( + '/fork///settings//', + methods=('GET', 'POST')) @login_required def view_plugin(repo, plugin, username=None, full=True): """ Presents the settings of the project. diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py index 6b85ce6..6fc7491 100644 --- a/pagure/ui/repo.py +++ b/pagure/ui/repo.py @@ -8,6 +8,22 @@ """ +# no-member +# pylint: disable=E1101 +# too-many-lines +# pylint: disable=C0302 +# too-many-branches +# pylint: disable=R0912 +# too-many-locals +# pylint: disable=R0914 +# too-many-statements +# pylint: disable=R0915 +# bare-except +# pylint: disable=W0702 +# broad-except +# pylint: disable=W0703 + + import datetime import shutil import os @@ -39,10 +55,7 @@ import pagure.forms import pagure import pagure.ui.plugins from pagure import (APP, SESSION, LOG, __get_file_in_tree, login_required, - is_repo_admin, admin_session_timedout, authenticated) - - -# pylint: disable=E1101 + is_repo_admin, admin_session_timedout) @APP.route('/.git') @@ -51,7 +64,8 @@ def view_repo_git(repo, username=None): ''' Redirect to the project index page when user wants to view the git repo of the project ''' - return flask.redirect(flask.url_for('view_repo',repo=repo,username=username)) + return flask.redirect(flask.url_for( + 'view_repo', repo=repo, username=username)) @APP.route('//') @@ -200,7 +214,7 @@ def view_repo_branch(repo, branchname, username=None): orig_repo = pygit2.Repository(parentname) tree = None - safe=False + safe = False readme = None if not repo_obj.is_empty and not orig_repo.is_empty: @@ -209,10 +223,10 @@ def view_repo_branch(repo, branchname, username=None): else: compare_branch = None - compare_commits = [] + commit_list = [] if compare_branch: - compare_commits = [ + commit_list = [ commit.oid.hex for commit in orig_repo.walk( compare_branch.get_object().hex, @@ -223,11 +237,11 @@ def view_repo_branch(repo, branchname, username=None): for commit in repo_obj.walk( repo_commit.oid.hex, pygit2.GIT_SORT_TIME): - if commit.oid.hex in compare_commits: + if commit.oid.hex in commit_list: break diff_commits.append(commit.oid.hex) - tree=sorted(last_commits[0].tree, key=lambda x: x.filemode) + tree = sorted(last_commits[0].tree, key=lambda x: x.filemode) for i in tree: name, ext = os.path.splitext(i.name) if name == 'README': @@ -332,10 +346,10 @@ def view_commits(repo, branchname=None, username=None): else: compare_branch = None - compare_commits = [] + commit_list = [] if compare_branch: - compare_commits = [ + commit_list = [ commit.oid.hex for commit in orig_repo.walk( compare_branch.get_object().hex, @@ -347,7 +361,7 @@ def view_commits(repo, branchname=None, username=None): for commit in repo_obj.walk( repo_commit.oid.hex, pygit2.GIT_SORT_TIME): - if commit.oid.hex in compare_commits: + if commit.oid.hex in commit_list: break diff_commits.append(commit.oid.hex) diff_commits_full.append(commit) @@ -411,8 +425,10 @@ def compare_commits(repo, commit1, commit2, username=None): first_commit = commit1 last_commit = commit2 - commits = map(lambda x: x.oid.hex[:len(first_commit)], - repo_obj.walk(last_commit, pygit2.GIT_SORT_TIME)) + commits = [ + commit.oid.hex[:len(first_commit)] + for commit in repo_obj.walk(last_commit, pygit2.GIT_SORT_TIME) + ] if first_commit not in commits: first_commit = commit2 @@ -445,7 +461,8 @@ def compare_commits(repo, commit1, commit2, username=None): @APP.route('//blob//f/') -@APP.route('/fork///blob//f/') +@APP.route( + '/fork///blob//f/') def view_file(repo, identifier, filename, username=None): """ Displays the content of a file or a tree for the specified repo. """ @@ -553,7 +570,7 @@ def view_file(repo, identifier, filename, username=None): headers['Content-Encoding'] = encoding return ( - flask.render_template( + flask.render_template( 'file.html', select='tree', repo=repo, @@ -576,9 +593,11 @@ def view_file(repo, identifier, filename, username=None): @APP.route('//raw/', defaults={'filename': None}) @APP.route('//raw//f/') -@APP.route('/fork///raw/', - defaults={'filename': None}) -@APP.route('/fork///raw//f/') +@APP.route( + '/fork///raw/', + defaults={'filename': None}) +@APP.route( + '/fork///raw//f/') def view_raw_file(repo, identifier, filename=None, username=None): """ Displays the raw content of a file of a commit for the specified repo. """ @@ -1022,7 +1041,7 @@ def view_settings(repo, username=None): tags=tags, plugins=plugins, repo_admin=repo_admin, - branchname = branchname, + branchname=branchname, ) @@ -1276,14 +1295,15 @@ def change_ref_head(repo, username=None): if form.validate_on_submit(): branchname = form.branches.data try: - reference = repo_obj.lookup_reference('refs/heads/%s'%branchname).resolve() + reference = repo_obj.lookup_reference( + 'refs/heads/%s' % branchname).resolve() repo_obj.set_head(reference.name) - flask.flash('Default branch updated to %s'%branchname) + flask.flash('Default branch updated to %s' % branchname) except Exception as err: # pragma: no cover APP.logger.exception(err) return flask.redirect(flask.url_for( - 'view_settings', username=username, repo=repo.name)) + 'view_settings', username=username, repo=repo.name)) @APP.route('//delete', methods=['POST']) @@ -1455,7 +1475,8 @@ def add_user(repo, username=None): """ if not pagure.APP.config.get('ENABLE_USER_MNGT', True): - flask.abort(404, 'User management is not allowed in this pagure instance') + flask.abort( + 404, 'User management is not allowed in this pagure instance') if admin_session_timedout(): if flask.request.method == 'POST': @@ -1506,14 +1527,16 @@ def add_user(repo, username=None): @APP.route('//dropgroup/', methods=['POST']) -@APP.route('/fork///dropgroup/', methods=['POST']) +@APP.route( + '/fork///dropgroup/', methods=['POST']) @login_required def remove_group_project(repo, groupid, username=None): """ Remove the specified group from the project. """ if not pagure.APP.config.get('ENABLE_USER_MNGT', True): - flask.abort(404, 'User management is not allowed in this pagure instance') + flask.abort( + 404, 'User management is not allowed in this pagure instance') if admin_session_timedout(): flask.flash('Action canceled, try it again', 'error') @@ -1572,7 +1595,8 @@ def add_group_project(repo, username=None): """ if not pagure.APP.config.get('ENABLE_USER_MNGT', True): - flask.abort(404, 'User management is not allowed in this pagure instance') + flask.abort( + 404, 'User management is not allowed in this pagure instance') if admin_session_timedout(): if flask.request.method == 'POST':