ruff check --fix

Author: mikaelfrykholm

src/pyff/api.py

@@ -2,7 +2,7 @@
 import threading
 from datetime import datetime, timedelta
 from json import dumps
-from typing import Any, Dict, List, Optional, Tuple
+from typing import Any, Optional
 from collections.abc import Generator, Iterable, Mapping
 
 import pyramid.httpexceptions as exc
@@ -186,7 +186,7 @@ def _d(x: Optional[str], do_split: bool = True) -> tuple[Optional[str], Optional
     if request.body:
         try:
             request.matchdict.update(request.json_body)
-        except ValueError as ex:
+        except ValueError:
             pass
 
     entry = request.matchdict.get('entry', 'request')

src/pyff/builtins.py

@@ -14,7 +14,7 @@
 from datetime import datetime
 from io import BytesIO
 from str2bool import str2bool
-from typing import Dict, Optional
+from typing import Optional
 
 import ipaddress
 import xmlsec
@@ -1457,7 +1457,7 @@ def drop_xsi_type(req: Plumbing.Request, *opts):
     def _drop_xsi_type(elt):
         try:
             del elt.attrib["{%s}type" % NS["xsi"]]
-        except Exception as ex:
+        except Exception:
             pass
 
     with_tree(root(req.t), _drop_xsi_type)
@@ -1570,7 +1570,7 @@ def certreport(req: Plumbing.Request, *opts):
                                     "{} expires in {}".format(cert.getSubject(), dt),
                                 )
                                 log.warning("{} expires in {}".format(eid, dt))
-                        except ValueError as ex:
+                        except ValueError:
                             annotate_entity(
                                 entity_elt,
                                 "certificate-error",

src/pyff/parse.py

@@ -1,7 +1,7 @@
 import os
 from abc import ABC
 from collections import deque
-from typing import Any, Dict, List, Optional
+from typing import Any, Optional
 
 from pydantic import BaseModel, Field
 from urllib.parse import quote as urlescape

src/pyff/pipes.py

@@ -7,7 +7,7 @@
 import functools
 import os
 import traceback
-from typing import Any, Callable, Dict, List, Optional, Tuple, Type, Union
+from typing import Any, Callable
 from collections.abc import Iterable
 
 import yaml
@@ -112,7 +112,7 @@ def _n(_d: str) -> tuple[str, list[str]]:
     opts: list[str] = []
     if is_text(d):
         name, opts = _n(d)
-    elif hasattr(d, '__iter__') and not type(d) is dict:
+    elif hasattr(d, '__iter__') and type(d) is not dict:
         if not len(d):
             raise PipeException("This does not look like a length of pipe... \n%s" % repr(d))
         name, opts = _n(d[0])

src/pyff/repo.py

@@ -1,4 +1,5 @@
-import random, time
+import random
+import time
 
 from pyff.constants import NS, config
 from pyff.logs import get_log

src/pyff/samlmd.py

@@ -2,18 +2,18 @@
 import traceback
 from base64 import b64decode
 from copy import deepcopy
-from datetime import datetime, timedelta, timezone
+from datetime import datetime, timedelta
 from str2bool import str2bool
 from io import BytesIO
 from itertools import chain
-from typing import Any, Dict, List, Optional, Union
+from typing import Any, Optional, Union
 
 from lxml import etree
 from lxml.builder import ElementMaker
 from lxml.etree import DocumentInvalid, Element, ElementTree
 from pydantic import Field
 from xmlsec.crypto import CertDict
-from .resource import Resource, ResourceHandler, ResourceOpts
+from .resource import Resource, ResourceOpts
 
 from pyff.constants import ATTRS, NF_URI, NS, config
 from pyff.exceptions import *

src/pyff/store.py

@@ -303,7 +303,12 @@ def __call__(self, *args, **kwargs):
         if watched is not None and scheduler is not None:
             for r in watched.walk():
                 if r.t is None and len(r.children) > 0:
-                    r.t = entitiesdescriptor(list(filter(lambda c: c is not None, [c.t for c in r.children])), name=r.name, validate=True, filter_invalid=True)
+                    r.t = entitiesdescriptor(
+                        list(filter(lambda c: c is not None, [c.t for c in r.children])),
+                        name=r.name,
+                        validate=True,
+                        filter_invalid=True,
+                    )
                 if r.t is not None:
                     self.update(r.t, tid=r.name, etag=r.etag)
                 else:
@@ -337,22 +342,22 @@ def select(self, member, xp=None):
         the metadata repository then it is fetched an treated as a list of (one per line) of selectors. If all else
         fails an empty list is returned.
         """
-        l = self._select(member)
-        if hasattr(l, 'tag'):
-            l = [l]
-        elif hasattr(l, '__iter__'):
-            l = list(l)
+        res = self._select(member)
+        if hasattr(res, 'tag'):
+            res = [res]
+        elif hasattr(res, '__iter__'):
+            res = list(res)
 
         if xp is None:
-            return l
+            return res
         else:
-            log.debug("filtering %d entities using xpath %s" % (len(l), xp))
-            t = entitiesdescriptor(l, 'dummy', lookup_fn=self.lookup)
+            log.debug("filtering %d entities using xpath %s" % (len(res), xp))
+            t = entitiesdescriptor(res, 'dummy', lookup_fn=self.lookup)
             if t is None:
                 return []
-            l = root(t).xpath(xp, namespaces=NS, smart_strings=False)
-            log.debug("got %d entities after filtering" % len(l))
-            return l
+            res = root(t).xpath(xp, namespaces=NS, smart_strings=False)
+            log.debug("got %d entities after filtering" % len(res))
+            return res
 
     def merge(self, t, nt, strategy=merge_strategies.replace_existing, strategy_name=None):
         """
@@ -463,7 +468,7 @@ def _match(qq, elt):
                 m = _match(query, e)
                 if m is not None:
                     d = entity_simple_summary(e)
-                    ll = d['title'].lower()
+                    _ll = d['title'].lower()
                     d['matched'] = m
             else:
                 d = entity_simple_summary(e)
@@ -620,7 +625,7 @@ def _reindex(self):
             try:
                 log.debug("releasing index lock")
                 lock.release()
-            except ThreadError as ex:
+            except ThreadError as _ex:
                 pass
 
     def dump(self):

src/pyff/test/test_md_api.py

@@ -62,7 +62,7 @@ def test_status(self):
     def test_parse_robots(self):
         try:
             import urllib.robotparser as robotparser
-        except ImportError as ex:
+        except ImportError:
             raise unittest.SkipTest()
 
         rp = robotparser.RobotFileParser()

src/pyff/test/test_mdsl.py

@@ -1,22 +1,15 @@
-import json
 import os
-import shutil
-import sys
 import tempfile
 
 import pytest
 import yaml
 from mako.lookup import TemplateLookup
-from unittest.mock import patch
 from io import StringIO
 from pyff import builtins
-from pyff.exceptions import MetadataException
-from pyff.parse import ParserException
-from pyff.pipes import PipeException, Plumbing, plumbing
+from pyff.pipes import Plumbing, plumbing
 from pyff.repo import MDRepository
-from pyff.resource import ResourceException
-from pyff.test import ExitException, SignerTestCase
-from pyff.utils import hash_id, parse_xml, resource_filename, root, dumptree
+from pyff.test import SignerTestCase
+from pyff.utils import parse_xml
 from pyff.constants import NS
 
 

src/pyff/test/test_rwlock.py

@@ -138,7 +138,7 @@ def test_deadlock(self):
             for i in range(0, 10):
                 self._raise(w[i])
             assert False
-        except ValueError as ex:
+        except ValueError:
             pass
 
     def test_2_readers_and_3_writers(self):

src/pyff/test/test_utils.py

@@ -190,7 +190,7 @@ def _cb(*args, **kwargs):
         try:
             f("foo")
             assert False
-        except AssertionError as ex:
+        except AssertionError:
             pass
 
 

src/pyff/utils.py

@@ -22,7 +22,7 @@
 from itertools import chain
 from threading import local
 from time import gmtime, strftime
-from typing import Any, BinaryIO, Callable, Dict, List, Optional, Set, Tuple, Union
+from typing import Any, BinaryIO, Callable, Optional, Union
 from collections.abc import Sequence
 
 import pkg_resources
@@ -720,7 +720,7 @@ def url_get(url: str, verify_tls: Optional[bool] = False) -> Response:
         headers['If-None-Match'] = _etag
     try:
         r = s.get(url, headers=headers, verify=verify_tls, timeout=config.request_timeout)
-    except OSError as ex:
+    except OSError:
         s = requests.Session()
         r = s.get(url, headers=headers, verify=verify_tls, timeout=config.request_timeout)