Browse Source

fix: flake8 and black unit test errors

Dominik Wombacher 1 year ago
parent
commit
c37ea21667

+ 7 - 7
pagure/api/fork.py

@@ -504,7 +504,7 @@ def api_pull_request_update(repo, requestid, username=None, namespace=None):
     request = _get_request(repo, requestid)
     _check_pull_request_access(request, assignee=True)
 
-    form = pagure.forms.RequestPullForm(meta={'csrf': False})
+    form = pagure.forms.RequestPullForm(meta={"csrf": False})
     if not form.validate_on_submit():
         raise pagure.exceptions.APIError(
             400, error_code=APIERROR.EINVALIDREQ, errors=form.errors
@@ -942,7 +942,7 @@ def api_pull_request_add_comment(
     _check_token(repo, project_token=False)
     request = _get_request(repo, requestid)
 
-    form = pagure.forms.AddPullRequestCommentForm(meta={'csrf': False})
+    form = pagure.forms.AddPullRequestCommentForm(meta={"csrf": False})
     if form.validate_on_submit():
         comment = form.comment.data
         commit = form.commit.data or None
@@ -1123,9 +1123,9 @@ def api_pull_request_add_flag(repo, requestid, username=None, namespace=None):
     request = _get_request(repo, requestid)
 
     if "status" in get_request_data():
-        form = pagure.forms.AddPullRequestFlagForm(meta={'csrf': False})
+        form = pagure.forms.AddPullRequestFlagForm(meta={"csrf": False})
     else:
-        form = pagure.forms.AddPullRequestFlagFormV1(meta={'csrf': False})
+        form = pagure.forms.AddPullRequestFlagFormV1(meta={"csrf": False})
     if form.validate_on_submit():
         username = form.username.data
         percent = form.percent.data.strip() if form.percent.data else None
@@ -1376,7 +1376,7 @@ def api_subscribe_pull_request(repo, requestid, username=None, namespace=None):
     _check_token(repo)
     request = _get_request(repo, requestid)
 
-    form = pagure.forms.SubscribtionForm(meta={'csrf': False})
+    form = pagure.forms.SubscribtionForm(meta={"csrf": False})
     if form.validate_on_submit():
         status = is_true(form.status.data)
         try:
@@ -1549,7 +1549,7 @@ def api_pull_request_create(repo, username=None, namespace=None):
     _check_pull_request(repo_to)
     _check_token(repo_from, project_token=False)
 
-    form = pagure.forms.RequestPullForm(meta={'csrf': False})
+    form = pagure.forms.RequestPullForm(meta={"csrf": False})
     if not form.validate_on_submit():
         raise pagure.exceptions.APIError(
             400, error_code=APIERROR.EINVALIDREQ, errors=form.errors
@@ -1838,7 +1838,7 @@ def api_pull_request_assign(repo, requestid, username=None, namespace=None):
     request = _get_request(repo, requestid)
     _check_pull_request_access(request, assignee=True)
 
-    form = pagure.forms.AssignIssueForm(meta={'csrf': False})
+    form = pagure.forms.AssignIssueForm(meta={"csrf": False})
     if form.validate_on_submit():
         assignee = form.assignee.data or None
         # Create our metadata comment object

+ 7 - 7
pagure/api/issue.py

@@ -168,7 +168,7 @@ def api_new_issue(repo, username=None, namespace=None):
     form = pagure.forms.IssueFormSimplied(
         priorities=repo.priorities,
         milestones=repo.milestones,
-        meta={'csrf': False},
+        meta={"csrf": False},
     )
     if form.validate_on_submit():
         title = form.title.data
@@ -663,7 +663,7 @@ def api_issue_update(repo, issueid, username=None, namespace=None):
     issue = _get_issue(repo, issue_id, issueuid=issue_uid)
     _check_private_issue_access(issue)
 
-    form = pagure.forms.IssueFormSimplied(meta={'csrf': False})
+    form = pagure.forms.IssueFormSimplied(meta={"csrf": False})
 
     if form.validate_on_submit():
         title = form.title.data.strip()
@@ -837,7 +837,7 @@ def api_change_status_issue(repo, issueid, username=None, namespace=None):
 
     status = pagure.lib.query.get_issue_statuses(flask.g.session)
     form = pagure.forms.StatusForm(
-        status=status, close_status=repo.close_status, meta={'csrf': False}
+        status=status, close_status=repo.close_status, meta={"csrf": False}
     )
 
     close_status = None
@@ -951,7 +951,7 @@ def api_change_milestone_issue(repo, issueid, username=None, namespace=None):
     _check_ticket_access(issue, open_access=open_access)
 
     form = pagure.forms.MilestoneForm(
-        milestones=repo.milestones.keys(), meta={'csrf': False}
+        milestones=repo.milestones.keys(), meta={"csrf": False}
     )
 
     if form.validate_on_submit():
@@ -1049,7 +1049,7 @@ def api_comment_issue(repo, issueid, username=None, namespace=None):
     issue = _get_issue(repo, issueid)
     _check_private_issue_access(issue)
 
-    form = pagure.forms.CommentForm(meta={'csrf': False})
+    form = pagure.forms.CommentForm(meta={"csrf": False})
     if form.validate_on_submit():
         comment = form.comment.data
         try:
@@ -1138,7 +1138,7 @@ def api_assign_issue(repo, issueid, username=None, namespace=None):
     open_access = repo.settings.get("open_metadata_access_to_all", False)
     _check_ticket_access(issue, assignee=True, open_access=open_access)
 
-    form = pagure.forms.AssignIssueForm(meta={'csrf': False})
+    form = pagure.forms.AssignIssueForm(meta={"csrf": False})
     if form.validate_on_submit():
         assignee = form.assignee.data or None
         # Create our metadata comment object
@@ -1236,7 +1236,7 @@ def api_subscribe_issue(repo, issueid, username=None, namespace=None):
     issue = _get_issue(repo, issueid)
     _check_private_issue_access(issue)
 
-    form = pagure.forms.SubscribtionForm(meta={'csrf': False})
+    form = pagure.forms.SubscribtionForm(meta={"csrf": False})
     if form.validate_on_submit():
         status = is_true(form.status.data)
         try:

+ 1 - 1
pagure/api/plugins.py

@@ -108,7 +108,7 @@ def api_install_plugin(repo, plugin, username=None, namespace=None):
         else:
             dbobj = plugin.db_object()
 
-    form = plugin.form(obj=dbobj, meta={'csrf': False})
+    form = plugin.form(obj=dbobj, meta={"csrf": False})
     form.active.data = True
     for field in plugin.form_fields:
         fields.append(getattr(form, field))

+ 11 - 7
pagure/api/project.py

@@ -205,7 +205,7 @@ def api_project_tags_new(repo, username=None, namespace=None):
     repo = _get_repo(repo, username, namespace)
     _check_token(repo, project_token=False)
 
-    form = pagure.forms.ApiAddIssueTagForm(meta={'csrf': False})
+    form = pagure.forms.ApiAddIssueTagForm(meta={"csrf": False})
     if form.validate_on_submit():
         tag_name = form.tag.data
         tag_description = form.tag_description.data
@@ -433,7 +433,7 @@ def api_new_git_tags(repo, username=None, namespace=None):
         flask.request.values.get("with_commits", False)
     )
 
-    form = pagure.forms.AddGitTagForm(meta={'csrf': False})
+    form = pagure.forms.AddGitTagForm(meta={"csrf": False})
     created = None
     if form.validate_on_submit():
         user_obj = pagure.lib.query.get_user(
@@ -1455,7 +1455,9 @@ def api_new_project():
     if user:
         namespaces.extend([grp for grp in user.groups])
 
-    form = pagure.forms.ProjectForm(namespaces=namespaces, meta={'csrf': False})
+    form = pagure.forms.ProjectForm(
+        namespaces=namespaces, meta={"csrf": False}
+    )
     if form.validate_on_submit():
         name = form.name.data
         description = form.description.data
@@ -1739,7 +1741,7 @@ def api_fork_project():
     """
     output = {}
 
-    form = pagure.forms.ForkRepoForm(meta={'csrf': False})
+    form = pagure.forms.ForkRepoForm(meta={"csrf": False})
     if form.validate_on_submit():
         repo = form.repo.data
         username = form.username.data or None
@@ -2433,7 +2435,7 @@ def api_commit_add_flag(repo, commit_hash, username=None, namespace=None):
     except ValueError:
         raise pagure.exceptions.APIError(404, error_code=APIERROR.ENOCOMMIT)
 
-    form = pagure.forms.AddPullRequestFlagForm(meta={'csrf': False})
+    form = pagure.forms.AddPullRequestFlagForm(meta={"csrf": False})
     if form.validate_on_submit():
         username = form.username.data
         percent = form.percent.data.strip() if form.percent.data else None
@@ -2700,7 +2702,7 @@ def api_modify_acls(repo, namespace=None, username=None):
     project = _get_repo(repo, username, namespace)
     _check_token(project, project_token=False)
 
-    form = pagure.forms.ModifyACLForm(meta={'csrf': False})
+    form = pagure.forms.ModifyACLForm(meta={"csrf": False})
     if form.validate_on_submit():
         acl = form.acl.data
         group = None
@@ -3189,7 +3191,9 @@ def api_project_create_api_token(repo, namespace=None, username=None):
         )
 
     authorized_acls = pagure_config.get("USER_ACLS", [])
-    form = pagure.forms.NewTokenForm(meta={'csrf': False}, sacls=authorized_acls)
+    form = pagure.forms.NewTokenForm(
+        meta={"csrf": False}, sacls=authorized_acls
+    )
     if form.validate_on_submit():
         acls = form.acls.data
         description = form.description.data

+ 0 - 1
pagure/hooks/files/git_multimail_upstream.py

@@ -114,7 +114,6 @@ if PYTHON3:
         except UnicodeEncodeError:
             return out.decode(ENCODING)
 
-
 else:
 
     def is_string(s):

+ 4 - 4
pagure/internal/__init__.py

@@ -226,7 +226,7 @@ def check_ssh_access():
 @internal_access_only
 def pull_request_add_comment():
     """Add a comment to a pull-request."""
-    pform = pagure.forms.ProjectCommentForm(meta={'csrf': False})
+    pform = pagure.forms.ProjectCommentForm(meta={"csrf": False})
     if not pform.validate_on_submit():
         flask.abort(400, description="Invalid request")
 
@@ -240,7 +240,7 @@ def pull_request_add_comment():
     if not request:
         flask.abort(404, description="Pull-request not found")
 
-    form = pagure.forms.AddPullRequestCommentForm(meta={'csrf': False})
+    form = pagure.forms.AddPullRequestCommentForm(meta={"csrf": False})
 
     if not form.validate_on_submit():
         flask.abort(400, description="Invalid request")
@@ -277,7 +277,7 @@ def pull_request_add_comment():
 @internal_access_only
 def ticket_add_comment():
     """Add a comment to an issue."""
-    pform = pagure.forms.ProjectCommentForm(meta={'csrf': False})
+    pform = pagure.forms.ProjectCommentForm(meta={"csrf": False})
     if not pform.validate_on_submit():
         flask.abort(400, description="Invalid request")
 
@@ -308,7 +308,7 @@ def ticket_add_comment():
             "to view it",
         )
 
-    form = pagure.forms.CommentForm(meta={'csrf': False})
+    form = pagure.forms.CommentForm(meta={"csrf": False})
 
     if not form.validate_on_submit():
         flask.abort(400, description="Invalid request")

+ 1 - 1
pagure/lib/tasks.py

@@ -932,7 +932,7 @@ def update_checksums_file(self, session, folder, filenames):
         # for each files computes the different algorythm supported
         with open(os.path.join(folder, filename), "rb") as stream:
             while True:
-                buf = stream.read(2 * 2 ** 10)
+                buf = stream.read(2 * 2**10)
                 if buf:
                     for hasher in algos.values():
                         hasher.update(buf)

+ 27 - 7
pagure/ui/fork.py

@@ -557,8 +557,15 @@ def request_pull_edit(repo, requestid, username=None, namespace=None):
     form = pagure.forms.RequestPullEditForm(branches=flask.g.branches)
     if form.validate_on_submit():
         request.title = form.title.data.strip() if form.title.data else None
-        request.initial_comment = form.initial_comment.data.strip() if form.initial_comment.data else None
-        request.branch = form.branch_to.data.strip() if form.branch_to.data else None
+        request.initial_comment = (
+            form.initial_comment.data.strip()
+            if form.initial_comment.data
+            else None
+        )
+        request.branch = (
+            form.branch_to.data.strip() if form.branch_to.data else None
+        )
+
         if flask.g.fas_user.username == request.user.username:
             request.allow_rebase = form.allow_rebase.data
         flask.g.session.add(request)
@@ -1721,7 +1728,11 @@ def new_request_pull(
             if orig_commit:
                 orig_commit = orig_commit.oid.hex
 
-            initial_comment = form.initial_comment.data.strip() if form.initial_comment.data else None
+            initial_comment = (
+                form.initial_comment.data.strip()
+                if form.initial_comment.data
+                else None
+            )
             commit_start = commit_stop = None
             if diff_commits:
                 commit_stop = diff_commits[0].oid.hex
@@ -1887,8 +1898,12 @@ def new_remote_request_pull(repo, username=None, namespace=None):
             except Exception as err:
                 flask.abort(500, description=err)
 
-        branch_from = form.branch_from.data.strip() if form.branch_from.data else None
-        branch_to = form.branch_to.data.strip() if form.branch_to.data else None
+        branch_from = (
+            form.branch_from.data.strip() if form.branch_from.data else None
+        )
+        branch_to = (
+            form.branch_to.data.strip() if form.branch_to.data else None
+        )
         remote_git = form.git_repo.data.strip() if form.git_repo.data else None
 
         repopath = pagure.utils.get_remote_repo_path(remote_git, branch_from)
@@ -1969,7 +1984,10 @@ def new_remote_request_pull(repo, username=None, namespace=None):
                 user=flask.g.fas_user.username,
             )
 
-            if form.initial_comment.data and form.initial_comment.data.strip() != "":
+            if (
+                form.initial_comment.data
+                and form.initial_comment.data.strip() != ""
+            ):
                 pagure.lib.query.add_pull_request_comment(
                     flask.g.session,
                     request=request,
@@ -2027,7 +2045,9 @@ def new_remote_request_pull(repo, username=None, namespace=None):
         except pygit2.GitError:
             branch_to = "master"
     else:
-        branch_to = form.branch_to.data.strip() if form.branch_to.data else None
+        branch_to = (
+            form.branch_to.data.strip() if form.branch_to.data else None
+        )
 
     return flask.render_template(
         "remote_pull_request.html",

+ 5 - 1
pagure/ui/issues.py

@@ -225,7 +225,11 @@ def update_issue(repo, issueid, username=None, namespace=None):
         new_milestone = None
         try:
             if repo.milestones:
-                new_milestone = form.milestone.data.strip() if form.milestone.data else None
+                new_milestone = (
+                    form.milestone.data.strip()
+                    if form.milestone.data
+                    else None
+                )
         except AttributeError:
             pass
 

+ 3 - 1
pagure/ui/repo.py

@@ -2374,7 +2374,9 @@ def add_token(repo, username=None, namespace=None):
             pagure.lib.query.add_token_to_user(
                 flask.g.session,
                 repo,
-                description=form.description.data.strip() if form.description.data else None,
+                description=form.description.data.strip()
+                if form.description.data
+                else None,
                 acls=form.acls.data,
                 username=flask.g.fas_user.username,
                 expiration_date=form.expiration_date.data,