From 7152183a71f9f324ccdad0d065fc6fc5c198cb26 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Nov 05 2017 14:47:48 +0000 Subject: Quick style changes Signed-off-by: Pierre-Yves Chibon --- diff --git a/pagure/lib/tasks.py b/pagure/lib/tasks.py index 5d6632b..8a4c207 100644 --- a/pagure/lib/tasks.py +++ b/pagure/lib/tasks.py @@ -382,8 +382,9 @@ def update_file_in_git(name, namespace, user, branch, branchto, filename, case=APP.config.get('CASE_SENSITIVE', False)) with project.lock('WORKER'): - pagure.lib.git._update_file_in_git(project, branch, branchto, filename, - content, message, userobj, email) + pagure.lib.git._update_file_in_git( + project, branch, branchto, filename, + content, message, userobj, email) session.remove() return ret('view_commits', repo=project.name, username=user, diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py index 46a4794..d124f35 100644 --- a/pagure/ui/repo.py +++ b/pagure/ui/repo.py @@ -2218,7 +2218,7 @@ def edit_file(repo, branchname, filename, username=None, namespace=None): form.commit_title.data.strip(), form.commit_message.data.strip() ), - username=flask.g.fas_user.username, + username=user.username, email=form.email.data, ).id return flask.redirect(flask.url_for( diff --git a/tests/test_pagure_flask_ui_repo.py b/tests/test_pagure_flask_ui_repo.py index 6494c03..7e002da 100644 --- a/tests/test_pagure_flask_ui_repo.py +++ b/tests/test_pagure_flask_ui_repo.py @@ -707,7 +707,6 @@ class PagureFlaskRepotests(tests.Modeltests): repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual(len(repo.users), 0) - @patch('pagure.ui.repo.admin_session_timedout') def test_remove_group_project_when_user_mngt_off(self, ast): """ Test the remove_group_project endpoint when user management is @@ -776,7 +775,6 @@ class PagureFlaskRepotests(tests.Modeltests): pagure.APP.config['ENABLE_USER_MNGT'] = True - @patch('pagure.ui.repo.admin_session_timedout') def test_remove_group_project(self, ast): """ Test the remove_group_project endpoint. """