Browse Source

Adjust pagure's source code for the newer flake8

Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>
Pierre-Yves Chibon 3 years ago
parent
commit
a6b52c1146
6 changed files with 14 additions and 9 deletions
  1. 1 1
      .flake8
  2. 1 1
      pagure/api/__init__.py
  3. 4 4
      pagure/lib/git_auth.py
  4. 6 1
      pagure/ui/filters.py
  5. 1 1
      pagure/ui/repo.py
  6. 1 1
      tests/test_style.py

+ 1 - 1
.flake8

@@ -1,3 +1,3 @@
 [flake8]
-ignore = W503,E203
+ignore = W503,E203,E902
 exclude = pagure/hooks/files/git_multimail_upstream.py

+ 1 - 1
pagure/api/__init__.py

@@ -33,7 +33,7 @@ API = flask.Blueprint("api_ns", __name__, url_prefix="/api/0")
 import pagure.lib.query  # noqa: E402
 import pagure.lib.tasks  # noqa: E402
 from pagure.config import config as pagure_config  # noqa: E402
-from pagure.doc_utils import (
+from pagure.doc_utils import (  # noqa: E402
     load_doc_title_and_name,
     modify_rst,
     modify_html,

+ 4 - 4
pagure/lib/git_auth.py

@@ -704,11 +704,11 @@ class Gitolite2Auth(GitAuthHelper):
         of lines as returned by _process_project.
         """
         repos = []
-        for l in lines:
-            if l.startswith("repo "):
-                repos.append([l])
+        for line in lines:
+            if line.startswith("repo "):
+                repos.append([line])
             else:
-                repos[-1].append(l)
+                repos[-1].append(line)
         for i, repo_lines in enumerate(repos):
             repos[i] = "\n".join(repo_lines)
         return repos

+ 6 - 1
pagure/ui/filters.py

@@ -374,7 +374,12 @@ def format_loc(
                     "%(comment)s"
                     "</div>"
                     "</section>"
-                    "</div></div>"
+                    "</div>"
+                    '<div class="card-footer bg-transparent d-flex '
+                    'align-items-center border-0 p-0">'
+                    "%(templ_edited)s"
+                    "</div>"
+                    "</div>"
                     "</td></tr>"
                     % (
                         {

+ 1 - 1
pagure/ui/repo.py

@@ -847,7 +847,7 @@ def view_history_file(repo, filename, username=None, namespace=None):
             fromref=branchname,
         )
         if log.strip():
-            log = [l.split(" ", 1) for l in log.strip().split("\n")]
+            log = [line.split(" ", 1) for line in log.strip().split("\n")]
         else:
             log = []
     except Exception:

+ 1 - 1
tests/test_style.py

@@ -41,7 +41,7 @@ class TestStyle(unittest.TestCase):
             sys.executable,
             "-m",
             "flake8",
-            "--ignore=E712,W503,E203",
+            "--ignore=E712,W503,E203,E902",
             REPO_PATH,
         ]