More ruffing.

Author: mikaelfrykholm

docs/conf.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Federation Feeder documentation build configuration file, created by
 # sphinx-quickstart on Thu Jul  5 12:38:40 2012.
@@ -11,8 +10,9 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys
 import os
+import sys
+
 import sphinx
 
 sys.path.insert(0, os.path.abspath('./../'))

pyproject.toml

@@ -55,15 +55,27 @@ line-length = 120
 target-version = "py39"
 
 [tool.ruff.lint]
-# future fixes....
-#select = [ 
-#    "B",  # flake8-bugbear
-#    "E",  # pycodestyle error
-#    "F",  # pyflakes
-#    "I",  # isort
-#    "UP",  # pyupgrade
-#    "W",  # pycodestyle warning
+#select = [
+##  "ANN",
+#  "ASYNC",
+#  "E",
+#  "ERA",
+#  "F",
+#  "FAST",
+#  "FLY",
+#  "FURB",
+#  "I",
+#  "PERF",
+#  "PGH",
+#  "PIE",
+#  "PL",
+#  "UP",
+#  "W",
 #]
+ignore = [
+"PLR0915",
+"PLR0912",
+]
 [tool.ruff.format]
 quote-style = "preserve"
 

scripts/csv2xrd.py

@@ -1,15 +1,14 @@
 #!/usr/bin/env python
 
-import io
 import sys
 
 from lxml import etree
 
 ns = {None: "http://docs.oasis-open.org/ns/xri/xrd-1.0"}
 
 xrds = etree.Element("{http://docs.oasis-open.org/ns/xri/xrd-1.0}XRDS", nsmap=ns)
-with io.open(sys.argv[1]) as fd:
-    for line in fd.readlines():
+with open(sys.argv[1]) as fd:
+    for line in fd:
         line = line.strip()
         e = [x.strip('"') for x in line.split(",")]
         xrd = etree.Element("{http://docs.oasis-open.org/ns/xri/xrd-1.0}XRD", nsmap=ns)

setup.py

@@ -1,26 +1,23 @@
 #!/usr/bin/env python3
-# -*- encoding: utf-8 -*-
 
-from setuptools import setup
 from pathlib import PurePath
 from platform import python_implementation
-from typing import List
 
-from setuptools import find_packages
+from setuptools import find_packages, setup
 
 __author__ = 'Leif Johansson'
 __version__ = '2.1.3'
 
 
-def load_requirements(path: PurePath) -> List[str]:
+def load_requirements(path: PurePath) -> list[str]:
     """ Load dependencies from a requirements.txt style file, ignoring comments etc. """
     res = []
     with open(path) as fd:
-        for line in fd.readlines():
-            while line.endswith('\n') or line.endswith('\\'):
+        for line in fd:
+            while line.endswith(('\n', '\\')):
                 line = line[:-1]
             line = line.strip()
-            if not line or line.startswith('-') or line.startswith('#'):
+            if not line or line.startswith(('-', '#')):
                 continue
             res += [line]
     return res

src/pyff/api.py

@@ -1,9 +1,10 @@
 import importlib
 import threading
+from collections.abc import Generator, Iterable, Mapping
 from datetime import datetime, timedelta
 from json import dumps
 from typing import Any, Optional
-from collections.abc import Generator, Iterable, Mapping
+from urllib.parse import quote_plus
 
 import pyramid.httpexceptions as exc
 import pytz
@@ -15,8 +16,8 @@
 from pyramid.events import NewRequest
 from pyramid.request import Request
 from pyramid.response import Response
-from urllib.parse import quote_plus
 
+from pyff import __version__
 from pyff.constants import config
 from pyff.exceptions import ResourceException
 from pyff.logs import get_log
@@ -25,7 +26,6 @@
 from pyff.resource import Resource
 from pyff.samlmd import entity_display_name
 from pyff.utils import b2u, dumptree, hash_id, json_serializer, utc_now
-from pyff import __version__
 
 log = get_log(__name__)
 
@@ -131,7 +131,6 @@ def call(entry: str) -> None:
     resp = requests.post(url)
     if resp.status_code >= 300:
         log.error(f'POST request to API endpoint at {url} failed: {resp.status_code} {resp.reason}')
-    return None
 
 
 def request_handler(request: Request) -> Response:
@@ -386,7 +385,7 @@ def _links(url: str, title: Any = None) -> None:
 
     for entity in request.registry.md.store.lookup('entities'):
         entity_display = entity_display_name(entity)
-        _links("/entities/%s" % hash_id(entity.get('entityID')), title=entity_display)
+        _links("/entities/{}".format(hash_id(entity.get('entityID'))), title=entity_display)
 
     aliases = request.registry.aliases
     for a in aliases.keys():