Merge pull request #221 from IdentityPython/ft-imports_cleanup

imports cleanup

Author: leifj

pytest.ini

@@ -0,0 +1,2 @@
+[pytest]
+addopts = --import-mode=importlib

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/api.py

@@ -17,14 +17,14 @@
 from six import b
 from six.moves.urllib_parse import quote_plus
 
-from .constants import config
-from .exceptions import ResourceException
-from .logs import get_log
-from .pipes import plumbing
-from .repo import MDRepository
-from .resource import Resource
-from .samlmd import entity_display_name
-from .utils import b2u, dumptree, duration2timedelta, hash_id, json_serializer, utc_now
+from pyff.constants import config
+from pyff.exceptions import ResourceException
+from pyff.logs import get_log
+from pyff.pipes import plumbing
+from pyff.repo import MDRepository
+from pyff.resource import Resource
+from pyff.samlmd import entity_display_name
+from pyff.utils import b2u, dumptree, duration2timedelta, hash_id, json_serializer, utc_now
 
 log = get_log(__name__)
 

src/pyff/builtins.py

@@ -20,15 +20,12 @@
 from lxml.etree import DocumentInvalid
 from six.moves.urllib_parse import quote_plus, urlparse
 
-from pyff.pipes import registry
-
-from .constants import NS
-from .decorators import deprecated
-from .exceptions import MetadataException
-from .logs import get_log
-from .pipes import PipeException, PipelineCallback, Plumbing, pipe
-from .resource import ResourceOpts
-from .samlmd import (
+from pyff.constants import NS
+from pyff.decorators import deprecated
+from pyff.exceptions import MetadataException
+from pyff.logs import get_log
+from pyff.pipes import PipeException, PipelineCallback, Plumbing, pipe, registry
+from pyff.samlmd import (
     annotate_entity,
     discojson_t,
     entitiesdescriptor,
@@ -41,7 +38,7 @@
     set_reginfo,
     sort_entities,
 )
-from .utils import (
+from pyff.utils import (
     datetime2iso,
     dumptree,
     duration2timedelta,

src/pyff/constants.py

@@ -5,7 +5,6 @@
 import getopt
 import json
 import logging
-import multiprocessing
 import os
 import re
 import sys
@@ -14,7 +13,7 @@
 import pyconfig
 import six
 
-from . import __version__ as pyff_version
+from pyff import __version__ as pyff_version
 
 __author__ = 'leifj'
 
@@ -230,7 +229,7 @@ class Config(object):
     The :py:const:`pyff.constants:config` object is a singleton instance of this Class and contains all
     configuration parameters available to pyFF. Each parameter can be set directly, via :py:mod:`pyconfig`
     or via environment variables by prefixing the setting name in upper case with "PYFF_". The setting
-    called "loglevel" then becomes "PYFF_LOGLEVEL" etc. Any occurence of '.' or '-' is also transscribed
+    called "loglevel" then becomes "PYFF_LOGLEVEL" etc. Any occurrence of '.' or '-' is also transcribed
     to '_' when the setting is referenced as an environment variable.
 
 

src/pyff/decorators.py

@@ -1,11 +1,8 @@
 """
 Various decorators used in pyFF.
 """
-import functools
-import time
-from collections import namedtuple
 
-from .logs import get_log
+from pyff.logs import get_log
 
 __author__ = 'leifj'
 

src/pyff/fetch.py

@@ -2,9 +2,9 @@
 import threading
 from datetime import datetime
 
-from .constants import config
-from .logs import get_log
-from .utils import Watchable, load_callable, url_get
+from pyff.constants import config
+from pyff.logs import get_log
+from pyff.utils import Watchable, load_callable, url_get
 
 log = get_log(__name__)
 

src/pyff/md.py

@@ -7,9 +7,9 @@
 import sys
 import traceback
 
-from .constants import config, parse_options
-from .pipes import plumbing
-from .repo import MDRepository
+from pyff.constants import config, parse_options
+from pyff.pipes import plumbing
+from pyff.repo import MDRepository
 
 
 def main():

src/pyff/mdq.py

@@ -5,18 +5,15 @@
 
 from __future__ import unicode_literals
 
-import importlib
-import logging
 import os
-import sys
 
 import gunicorn.app.base
 from six import iteritems
 
-from .api import mkapp
-from .constants import config, parse_options
-from .logs import get_log
-from .repo import MDRepository
+from pyff.api import mkapp
+from pyff.constants import config, parse_options
+from pyff.logs import get_log
+from pyff.repo import MDRepository
 
 log = get_log(__name__)
 

src/pyff/parse.py

@@ -1,14 +1,14 @@
 import os
 from abc import ABC
 from collections import deque
-from typing import Any, AnyStr, Dict, List, Mapping, Optional, Union
+from typing import Any, List, Mapping, Optional
 
 from xmlsec.crypto import CertDict
 
-from .constants import NS
-from .logs import get_log
-from .resource import Resource, ResourceOpts
-from .utils import find_matching_files, parse_xml, root, unicode_stream, utc_now
+from pyff.constants import NS
+from pyff.logs import get_log
+from pyff.resource import Resource
+from pyff.utils import find_matching_files, parse_xml, root, unicode_stream, utc_now
 
 __author__ = 'leifj'