additional cleanups

Author: fredrikt

setup.py

@@ -4,9 +4,6 @@
 from distutils.core import setup
 from pathlib import PurePath
 from platform import python_implementation
-from sys import version_info
-
-from os.path import abspath, dirname, join
 from typing import List
 
 from setuptools import find_packages

src/pyff/resource.py

@@ -38,6 +38,11 @@
     from pyff.pipes import PipelineCallback
     from pyff.utils import Lambda
 
+    # ensure static analysis doesn't flag these as unused
+    assert PyffParser
+    assert PipelineCallback
+    assert Lambda
+
 requests.packages.urllib3.disable_warnings()
 
 log = get_log(__name__)

src/pyff/samlmd.py

@@ -89,7 +89,6 @@ def parse_saml_metadata(
     :param opts: ResourceOpts instance
     :param base_url: use this base url to resolve relative URLs for XInclude processing
     :param validation_errors: A dict that will be used to return validation errors to the caller
-    :param cleanup: A list of callables that can be used to pre-process parsed metadata before validation. Use as a clue-bat.
 
     :return: Tuple with t (ElementTree), expire_time_offset, exception
     """

src/pyff/test/test_store.py

@@ -6,7 +6,6 @@
 import fakeredis
 
 from pyff.constants import ATTRS
-from pyff.samlmd import iter_entities
 from pyff.store import MemoryStore, RedisWhooshStore, SAMLStoreBase, entity_attribute_dict
 from pyff.utils import parse_xml, resource_filename, root
 

src/pyff/test/test_utils.py

@@ -24,7 +24,7 @@
     url_get,
 )
 
-from ..merge_strategies import remove, replace_existing
+from pyff.merge_strategies import remove, replace_existing
 
 
 class TestMetadata(TestCase):