From 0c00479d928b9ade06f2619453f8d17fd0cc0254 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Mar 21 2017 08:13:05 +0000 Subject: Flake8 fixes to pagure/ui --- diff --git a/pagure/ui/app.py b/pagure/ui/app.py index 319e4cd..b2a0ab5 100644 --- a/pagure/ui/app.py +++ b/pagure/ui/app.py @@ -817,9 +817,7 @@ def revoke_api_user_token(token_id): """ if admin_session_timedout(): flask.flash('Action canceled, try it again', 'error') - url = flask.url_for( - 'view_settings', username=username, repo=repo, - namespace=namespace) + url = flask.url_for('.user_settings') return flask.redirect( flask.url_for('auth_login', next=url)) diff --git a/pagure/ui/diff_style.py b/pagure/ui/diff_style.py index e409a77..690165b 100644 --- a/pagure/ui/diff_style.py +++ b/pagure/ui/diff_style.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """ - (c) 2016 - Copyright Red Hat Inc + (c) 2016-2017 - Copyright Red Hat Inc Authors: Mark Reynolds @@ -13,7 +13,7 @@ from pygments.token import Keyword, Name, Comment, String, Error, \ Number, Operator, Generic, Whitespace, Punctuation, Other, Literal -class DiffStyle(Style): +class DiffStyle(Style): # flake8: noqa - Ignore this entire file """This style is based off of "tango", and has been updated to show the background color of changed lines so that trailing white spaces can be identified.""" diff --git a/pagure/ui/filters.py b/pagure/ui/filters.py index 21e6b8b..3e7ef01 100644 --- a/pagure/ui/filters.py +++ b/pagure/ui/filters.py @@ -286,7 +286,8 @@ def blame_loc(loc, repo, username, blame): return if not isinstance(loc, six.text_type): - raise ValueError('"loc" must be a unicode string, not ' + str(type(loc))) + raise ValueError( + '"loc" must be a unicode string, not ' + str(type(loc))) output = [ '
', @@ -325,11 +326,12 @@ def blame_loc(loc, repo, username, blame): output.append( '%s' % ( - flask.url_for('view_commit', - repo=repo.name, - username=username, - namespace=repo.namespace, - commitid=diff.final_commit_id + flask.url_for( + 'view_commit', + repo=repo.name, + username=username, + namespace=repo.namespace, + commitid=diff.final_commit_id ), shorted_commit(diff.final_commit_id) ) @@ -541,10 +543,10 @@ def int_to_rgb(percent): percent = int(percent) if percent < 50: red = 255 - green = (255.0/50) * percent + green = (255.0 / 50) * percent else: green = 255 - red = (255.0/50) * (100 - percent) + red = (255.0 / 50) * (100 - percent) output = "rgb(%s, %s, 0);" % (int(red), int(green)) except ValueError: pass diff --git a/pagure/ui/fork.py b/pagure/ui/fork.py index c944d03..6b0177b 100644 --- a/pagure/ui/fork.py +++ b/pagure/ui/fork.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """ - (c) 2014-2016 - Copyright Red Hat Inc + (c) 2014-2017 - Copyright Red Hat Inc Authors: Pierre-Yves Chibon @@ -33,8 +33,6 @@ import pagure.forms from pagure import APP, SESSION, LOG, login_required, __get_file_in_tree - - def _get_parent_repo_path(repo): """ Return the path of the parent git repository corresponding to the provided Repository object from the DB. @@ -202,15 +200,15 @@ def request_pulls(repo, username=None, namespace=None): author=author, count=True) - reponame = flask.g.reponame repo_obj = flask.g.repo_obj if not repo_obj.is_empty and not repo_obj.head_is_unborn: head = repo_obj.head.shorthand else: head = 'master' - total_page = int(ceil(requests_cnt / float(flask.g.limit)) \ - if requests_cnt > 0 else 1) + total_page = 1 + if requests_cnt: + total_page = int(ceil(requests_cnt / float(flask.g.limit))) return flask.render_template( 'requests.html', @@ -826,7 +824,7 @@ def merge_request_pull(repo, requestid, username=None, namespace=None): methods=['POST']) @APP.route( '/fork////pull-request/cancel/', - methods=['POST']) + methods=['POST']) @login_required def cancel_request_pull(repo, requestid, username=None, namespace=None): """ Cancel request pulling request. @@ -867,8 +865,8 @@ def cancel_request_pull(repo, requestid, username=None, namespace=None): SESSION.rollback() APP.logger.exception(err) flask.flash( - 'We could not save all the info, please try again', - 'error') + 'We could not save all the info, please try again', + 'error') else: flask.flash('Invalid input submitted', 'error') @@ -880,7 +878,8 @@ def cancel_request_pull(repo, requestid, username=None, namespace=None): @APP.route( '//pull-request//assign', methods=['POST']) @APP.route( - '///pull-request//assign', methods=['POST']) + '///pull-request//assign', + methods=['POST']) @APP.route( '/fork///pull-request//assign', methods=['POST']) @@ -1029,7 +1028,6 @@ def new_request_pull( if not parent.settings.get('pull_requests', True): flask.abort(404, 'No pull-request allowed on this project') - repopath = flask.g.reponame repo_obj = flask.g.repo_obj parentpath = _get_parent_repo_path(repo) @@ -1111,8 +1109,8 @@ def new_request_pull( SESSION.rollback() APP.logger.exception(err) flask.flash( - 'We could not save all the info, please try again', - 'error') + 'We could not save all the info, please try again', + 'error') if not flask.g.repo_committer: form = None @@ -1180,7 +1178,6 @@ def new_remote_request_pull(repo, username=None, namespace=None): if not repo.settings.get('pull_requests', True): flask.abort(404, 'No pull-request allowed on this project') - parentpath = flask.g.reponame orig_repo = flask.g.repo_obj form = pagure.forms.RemoteRequestPullForm() diff --git a/pagure/ui/issues.py b/pagure/ui/issues.py index 048264c..a9865ed 100644 --- a/pagure/ui/issues.py +++ b/pagure/ui/issues.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """ - (c) 2014-2016 - Copyright Red Hat Inc + (c) 2014-2017 - Copyright Red Hat Inc Authors: Pierre-Yves Chibon @@ -210,7 +210,8 @@ def update_issue(repo, issueid, username=None, namespace=None): # The status field can be updated by both the admin and the # person who opened the ticket. # Update status - if flask.g.repo_user or flask.g.fas_user.username == issue.user.user: + if flask.g.repo_user \ + or flask.g.fas_user.username == issue.user.user: if new_status in status: msgs = pagure.lib.edit_issue( SESSION, @@ -342,8 +343,8 @@ def update_issue(repo, issueid, username=None, namespace=None): SESSION.rollback() APP.logger.exception(err) flask.flash( - 'We could not save all the info, please try again', - 'error') + 'We could not save all the info, please try again', + 'error') else: if is_js: return 'notok: %s' % form.errors @@ -469,7 +470,9 @@ def update_tags(repo, username=None, namespace=None): tags = [ tag.strip() for tag in flask.request.form.getlist('tag') - if tag.strip() and tag.strip() not in seen and not seen.add(tag.strip()) + if tag.strip() + and tag.strip() not in seen # noqa + and not seen.add(tag.strip()) ] tag_descriptions = [ @@ -482,7 +485,9 @@ def update_tags(repo, username=None, namespace=None): colors = [ col.strip() for col in flask.request.form.getlist('tag_color') - if col.strip() and col.strip() not in seen and not seen.add(col.strip()) + if col.strip() + and col.strip() not in seen + and not seen.add(col.strip()) ] color_pattern = re.compile('^#\w{3,6}$') @@ -638,8 +643,8 @@ def view_issues(repo, username=None, namespace=None): oth_issues_cnt = None total_issues_cnt = pagure.lib.search_issues( - SESSION, repo, tags=tags, assignee=assignee, - author=author, private=private, priority=priority, count=True) + SESSION, repo, tags=tags, assignee=assignee, + author=author, private=private, priority=priority, count=True) if status is not None: issues = pagure.lib.search_issues( SESSION, @@ -706,7 +711,10 @@ def view_issues(repo, username=None, namespace=None): ) tag_list = pagure.lib.get_tags_of_project(SESSION, repo) - total_page = int(ceil(issues_cnt / float(flask.g.limit)) if issues_cnt > 0 else 1) + total_page = 1 + if issues_cnt: + total_page = int(ceil(issues_cnt / float(flask.g.limit))) + return flask.render_template( 'issues.html', select='issues', @@ -933,8 +941,8 @@ def new_issue(repo, username=None, namespace=None): SESSION.rollback() APP.logger.exception(err) flask.flash( - 'We could not save all the info, please try again', - 'error') + 'We could not save all the info, please try again', + 'error') types = None default = None @@ -1202,8 +1210,8 @@ def edit_issue(repo, issueid, username=None, namespace=None): SESSION.rollback() APP.logger.exception(err) flask.flash( - 'We could not save all the info, please try again', - 'error') + 'We could not save all the info, please try again', + 'error') elif flask.request.method == 'GET': form.title.data = issue.title @@ -1268,8 +1276,8 @@ def upload_issue(repo, issueid, username=None, namespace=None): SESSION.rollback() APP.logger.exception(err) flask.flash( - 'We could not save all the info, please try again', - 'error') + 'We could not save all the info, please try again', + 'error') return flask.jsonify({ 'output': 'ok', @@ -1434,8 +1442,8 @@ def edit_comment_issue( SESSION.rollback() APP.logger.exception(err) flask.flash( - 'We could not save all the info, please try again', - 'error') + 'We could not save all the info, please try again', + 'error') if is_js: return 'ok' diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py index 2b9d848..b9e60c2 100644 --- a/pagure/ui/repo.py +++ b/pagure/ui/repo.py @@ -77,7 +77,6 @@ def view_repo(repo, username=None, namespace=None): """ Front page of a specific repo. """ repo_db = flask.g.repo - reponame = flask.g.reponame repo_obj = flask.g.repo_obj if not repo_obj.is_empty and not repo_obj.head_is_unborn: @@ -143,7 +142,6 @@ def view_repo_branch(repo, branchname, username=None, namespace=None): ''' Returns the list of branches in the repo. ''' repo = flask.g.repo - reponame = flask.g.reponame repo_obj = flask.g.repo_obj if branchname not in repo_obj.listall_branches(): @@ -292,9 +290,7 @@ def view_commits(repo, branchname=None, username=None, namespace=None): branch.get_object().hex, pygit2.GIT_SORT_TIME): # Filters the commits for an user - filters = None if author_obj: - filters = True tmp = False for email in author_obj.emails: if email.email == commit.author.email: @@ -440,7 +436,8 @@ def compare_commits(repo, commit1, commit2, username=None, namespace=None): @APP.route( '/fork///blob//f/') @APP.route( - '/fork////blob//f/') + '/fork////blob//f/' + '') def view_file(repo, identifier, filename, username=None, namespace=None): """ Displays the content of a file or a tree for the specified repo. """ @@ -504,7 +501,8 @@ def view_file(repo, identifier, filename, username=None, namespace=None): elif not is_binary_string(content.data): file_content = None try: - file_content = encoding_utils.decode(ktc.to_bytes(content.data)) + file_content = encoding_utils.decode( + ktc.to_bytes(content.data)) except pagure.exceptions.PagureException: # We cannot decode the file, so let's pretend it's a binary # file and let the user download it instead of displaying @@ -582,12 +580,12 @@ def view_file(repo, identifier, filename, username=None, namespace=None): @APP.route( '/fork///raw//f/') @APP.route( - '/fork////raw//f/') + '/fork////raw//f/' + '') def view_raw_file( repo, identifier, filename=None, username=None, namespace=None): """ Displays the raw content of a file of a commit for the specified repo. """ - repo = flask.g.repo repo_obj = flask.g.repo_obj if repo_obj.is_empty: @@ -678,7 +676,6 @@ def view_blame_file(repo, filename, username=None, namespace=None): """ Displays the blame of a file or a tree for the specified repo. """ repo = flask.g.repo - reponame = flask.g.reponame repo_obj = flask.g.repo_obj branchname = flask.request.args.get('identifier', 'master') @@ -782,7 +779,6 @@ def view_commit(repo, commitid, username=None, namespace=None): def view_commit_patch(repo, commitid, username=None, namespace=None): """ Render a commit in a repo as patch """ - repo = flask.g.repo repo_obj = flask.g.repo_obj try: @@ -1106,7 +1102,8 @@ def view_settings(repo, username=None, namespace=None): @APP.route('//settings/test_hook', methods=('GET', 'POST')) @APP.route('///settings/test_hook', methods=('GET', 'POST')) -@APP.route('/fork///settings/test_hook', methods=('GET', 'POST')) +@APP.route( + '/fork///settings/test_hook', methods=('GET', 'POST')) @APP.route( '/fork////settings/test_hook', methods=('GET', 'POST')) @@ -1122,7 +1119,6 @@ def test_web_hook(repo, username=None, namespace=None): flask.url_for('auth_login', next=flask.request.url)) repo = flask.g.repo - repo_obj = flask.g.repo_obj if not flask.g.repo_admin: flask.abort( @@ -1184,7 +1180,7 @@ def update_project(repo, username=None, namespace=None): repo.description = form.description.data repo.avatar_email = form.avatar_email.data.strip() repo.url = form.url.data.strip() - messages = pagure.lib.update_tags( + pagure.lib.update_tags( SESSION, repo, tags=[t.strip() for t in form.tags.data.split(',')], username=flask.g.fas_user.username, @@ -1354,7 +1350,8 @@ def update_milestones(repo, username=None, namespace=None): break for milestone_date in milestone_dates: - if milestone_date.strip() and milestone_dates.count(milestone_date) != 1: + if milestone_date.strip() \ + and milestone_dates.count(milestone_date) != 1: flask.flash( 'Date %s is present %s times' % ( milestone_date, milestone_dates.count(milestone_date) @@ -1401,7 +1398,6 @@ def change_ref_head(repo, username=None, namespace=None): flask.url_for('auth_login', next=url)) repo = flask.g.repo - reponame = flask.g.reponame repo_obj = flask.g.repo_obj if not flask.g.repo_admin: @@ -1963,8 +1959,7 @@ def regenerate_git(repo, username=None, namespace=None): form = pagure.forms.ConfirmationForm() if form.validate_on_submit(): if regenerate.lower() == 'requests'\ - and repo.settings.get('pull_requests'): - + and repo.settings.get('pull_requests'): # delete the requests repo and reinit # in case there are no requests @@ -2129,14 +2124,13 @@ def revoke_api_token(repo, token_id, username=None, namespace=None): '/fork///edit//f/', methods=('GET', 'POST')) @APP.route( - '/fork////edit//f/', - methods=('GET', 'POST')) + '/fork////edit//f/' + '', methods=('GET', 'POST')) @login_required def edit_file(repo, branchname, filename, username=None, namespace=None): """ Edit a file online. """ repo = flask.g.repo - reponame = flask.g.reponame repo_obj = flask.g.repo_obj if not flask.g.repo_admin: @@ -2220,7 +2214,6 @@ def edit_file(repo, branchname, filename, username=None, namespace=None): def delete_branch(repo, branchname, username=None, namespace=None): """ Delete the branch of a project. """ - reponame = flask.g.reponame repo_obj = flask.g.repo_obj if not flask.g.repo_committer: @@ -2354,7 +2347,6 @@ def update_public_notifications(repo, username=None, namespace=None): form = pagure.forms.PublicNotificationForm() - error = False if form.validate_on_submit(): issue_notifs = [ w.strip() @@ -2418,7 +2410,6 @@ def update_close_status(repo, username=None, namespace=None): form = pagure.forms.ConfirmationForm() - error = False if form.validate_on_submit(): close_status = [ w.strip() for w in flask.request.form.getlist('close_status') @@ -2520,7 +2511,6 @@ def update_custom_keys(repo, username=None, namespace=None): form = pagure.forms.ConfirmationForm() - error = False if form.validate_on_submit(): custom_keys = [ w.strip() for w in flask.request.form.getlist('custom_keys') @@ -2583,7 +2573,6 @@ def delete_report(repo, username=None, namespace=None): form = pagure.forms.ConfirmationForm() - error = False if form.validate_on_submit(): report = flask.request.form.get('report') reports = repo.reports