Even more cleanup, fixing linting errors.

Author: mikaelfrykholm

scripts/csv2xrd.py

@@ -9,20 +9,20 @@
 
 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 l in fd.readlines():
-      l = l.strip()
-      e = [x.strip('"') for x in l.split(",")]
-      xrd = etree.Element("{http://docs.oasis-open.org/ns/xri/xrd-1.0}XRD", nsmap=ns)
-      xrds.append(xrd) 
-      subject = etree.Element("{http://docs.oasis-open.org/ns/xri/xrd-1.0}Subject", nsmap=ns)
-      subject.text = e[3]
-      link = etree.Element("{http://docs.oasis-open.org/ns/xri/xrd-1.0}Link", nsmap=ns)
-      link.set('rel',"urn:oasis:names:tc:SAML:2.0:metadata")
-      link.set('href',e[3])
-      xrd.append(subject)
-      xrd.append(link)
-      title = etree.Element("{http://docs.oasis-open.org/ns/xri/xrd-1.0}Title", nsmap=ns)
-      title.text = e[1]
-      link.append(title)
+    for line in fd.readlines():
+        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)
+        xrds.append(xrd)
+        subject = etree.Element("{http://docs.oasis-open.org/ns/xri/xrd-1.0}Subject", nsmap=ns)
+        subject.text = e[3]
+        link = etree.Element("{http://docs.oasis-open.org/ns/xri/xrd-1.0}Link", nsmap=ns)
+        link.set('rel', "urn:oasis:names:tc:SAML:2.0:metadata")
+        link.set('href', e[3])
+        xrd.append(subject)
+        xrd.append(link)
+        title = etree.Element("{http://docs.oasis-open.org/ns/xri/xrd-1.0}Title", nsmap=ns)
+        title.text = e[1]
+        link.append(title)
 
 print(etree.tostring(xrds, pretty_print=True))

src/pyff/builtins.py

@@ -301,7 +301,7 @@ def fork(req: Plumbing.Request, *opts):
 def _any(lst, d):
     for x in lst:
         if x in d:
-            if type(d) == dict:
+            if d is dict:
                 return d[x]
             else:
                 return True
@@ -837,7 +837,7 @@ def select(req: Plumbing.Request, *opts):
         match = req.state['match']
 
         if isinstance(match, str):
-            query = [match.lower()]
+            _query = [match.lower()]
 
         def _strings(elt):
             lst = []
@@ -869,7 +869,7 @@ def _match(q, elt):
 
             if q is not None and len(q) > 0:
                 tokens = _strings(elt)
-                p = re.compile(fr'\b{q}', re.IGNORECASE)
+                p = re.compile(rf'\b{q}', re.IGNORECASE)
                 for tstr in tokens:
                     if p.search(tstr):
                         return tstr

src/pyff/constants.py

@@ -523,9 +523,9 @@ def parse_options(program, docs):
 
     if config.loglevel is None:
         config.loglevel = 'INFO'
-
-    if config.aliases is None or len(config.aliases) == 0:
-        config.aliases = dict(metadata=entities)
+    # FIXME, don't know what this is, but it is wrong.
+    #    if config.aliases is None or len(config.aliases) == 0:
+    #        config.aliases = dict(metadata=entities)
 
     if config.modules is None:
         config.modules = []

src/pyff/parse.py

@@ -27,7 +27,7 @@ def _format_key(k: str) -> str:
             # Turn expiration_time into 'Expiration Time'
             return k.replace('_', ' ').title()
 
-        res = {_format_key(k): v for k, v in self.dict().items()}
+        res = {_format_key(k): v for k, v in self.model_dump().items()}
         return res
 
 
@@ -114,7 +114,7 @@ def parse(self, resource: Resource, content: str) -> ParserInfo:
         info = ParserInfo(description='XRD links', expiration_time='never expires')
         t = parse_xml(unicode_stream(content))
 
-        relt = root(t)
+        _relt = root(t)
         for xrd in t.iter("{%s}XRD" % NS['xrd']):
             for link in xrd.findall(".//{{{}}}Link[@rel='{}']".format(NS['xrd'], NS['md'])):
                 link_href = link.get("href")

src/pyff/samlmd.py

@@ -16,10 +16,9 @@
 from .resource import Resource, ResourceOpts
 
 from pyff.constants import ATTRS, NF_URI, NS, config
-from pyff.exceptions import *
+from pyff.exceptions import MetadataException
 from pyff.logs import get_log
 from pyff.parse import ParserInfo, PyffParser, add_parser
-from pyff.resource import Resource, ResourceOpts
 from pyff.utils import (
     Lambda,
     b2u,
@@ -262,7 +261,7 @@ def _format_key(k: str) -> str:
             # Turn expiration_time into 'Expiration Time'
             return k.replace('_', ' ').title()
 
-        res = {_format_key(k): v for k, v in self.dict().items()}
+        res = {_format_key(k): v for k, v in self.model_dump().items()}
         return res
 
 
@@ -371,7 +370,7 @@ def filter_invalids_from_document(t: ElementTree, base_url, validation_errors) -
     xsd = schema()
     for e in iter_entities(t):
         if not xsd.validate(e):
-            error = xml_error(xsd.error_log, m=base_url)
+            _error = xml_error(xsd.error_log, m=base_url)
             entity_id = e.get("entityID", "(Missing entityID)")
             log.warning('removing \'{}\': schema validation failed: {}'.format(entity_id, xsd.error_log))
             validation_errors[entity_id] = f"{xsd.error_log}"
@@ -703,7 +702,7 @@ def _u(an, values):
 
 
 def gen_icon(e):
-    scopes = entity_scopes(e)
+    _scopes = entity_scopes(e)
 
 
 def entity_icon_url(e, langs=None):
@@ -990,7 +989,9 @@ def discojson_sp(e, global_trust_info=None, global_md_sources=None):
     sp['entityID'] = e.get('entityID', None)
 
     md_sources = e.findall(
-        "{{{}}}SPSSODescriptor/{{{}}}Extensions/{{{}}}TrustInfo/{{{}}}MetadataSource".format(NS['md'], NS['md'], NS['ti'], NS['ti'])
+        "{{{}}}SPSSODescriptor/{{{}}}Extensions/{{{}}}TrustInfo/{{{}}}MetadataSource".format(
+            NS['md'], NS['md'], NS['ti'], NS['ti']
+        )
     )
 
     sp['extra_md'] = {}
@@ -1294,7 +1295,9 @@ def _entity_attributes(e):
 
 def _eattribute(e, attr, nf):
     ea = _entity_attributes(e)
-    a = ea.xpath(".//saml:Attribute[@NameFormat='{}' and @Name='{}']".format(nf, attr), namespaces=NS, smart_strings=False)
+    a = ea.xpath(
+        ".//saml:Attribute[@NameFormat='{}' and @Name='{}']".format(nf, attr), namespaces=NS, smart_strings=False
+    )
     if a is None or len(a) == 0:
         a = etree.Element("{%s}Attribute" % NS['saml'])
         a.set('NameFormat', nf)

src/pyff/tools.py

@@ -6,6 +6,7 @@
        [--version]
        [uri1] [uri2]
 """
+
 import logging
 import sys
 import traceback
@@ -19,7 +20,8 @@
 from pyff.store import MemoryStore
 
 
-def difftool():
+# TODO: Is this even working? remove?
+def difftool(r1, r2):
     """
     diff two saml metadata sources
     """
@@ -31,12 +33,12 @@ def difftool():
 
     try:
         rm = Resource()
+        r1 = Resource(url=args[0], opts=ResourceOpts())
+        r2 = Resource(url=args[1], opts=ResourceOpts())
         rm.add(r1)
         rm.add(r2)
         store = MemoryStore()
         rm.reload(store=store)
-        r1 = Resource(url=args[0], opts=ResourceOpts())
-        r2 = Resource(url=args[1], opts=ResourceOpts())
         status = 0
 
         if r1.t.get('Name') != r2.t.get('Name'):