diff options
Diffstat (limited to 'logilab/common/modutils.py')
| -rw-r--r-- | logilab/common/modutils.py | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/logilab/common/modutils.py b/logilab/common/modutils.py index 9ca4c81..4c1aee6 100644 --- a/logilab/common/modutils.py +++ b/logilab/common/modutils.py @@ -39,18 +39,20 @@ from os.path import ( isdir, dirname, exists, - basename, expanduser, normcase, realpath, ) from imp import find_module, load_module, C_BUILTIN, PY_COMPILED, PKG_DIRECTORY -from distutils.sysconfig import get_config_var, get_python_lib +from distutils.sysconfig import get_python_lib from distutils.errors import DistutilsPlatformError from typing import Dict, List, Optional, Any, Tuple, Union, Sequence from types import ModuleType from _frozen_importlib_external import FileFinder +from logilab.common import STD_BLACKLIST, _handle_blacklist +from logilab.common.deprecation import deprecated + try: import zipimport except ImportError: @@ -60,9 +62,6 @@ except ImportError: ZIPFILE = object() -from logilab.common import STD_BLACKLIST, _handle_blacklist -from logilab.common.deprecation import deprecated - # Notes about STD_LIB_DIR # Consider arch-specific installation for STD_LIB_DIR definition # :mod:`distutils.sysconfig` contains to much hardcoded values to rely on @@ -108,7 +107,7 @@ class LazyObject(object): def __getattribute__(self, attr): try: return super(LazyObject, self).__getattribute__(attr) - except AttributeError as ex: + except AttributeError: return getattr(self._getobj(), attr) def __call__(self, *args, **kwargs): @@ -422,7 +421,7 @@ def get_modules( for directory, dirnames, filenames in os.walk(src_directory): _handle_blacklist(blacklist, dirnames, filenames) # check for __init__.py - if not "__init__.py" in filenames: + if "__init__.py" not in filenames: dirnames[:] = () continue if directory != src_directory: @@ -458,7 +457,7 @@ def get_module_files(src_directory: str, blacklist: Sequence[str] = STD_BLACKLIS for directory, dirnames, filenames in os.walk(src_directory): _handle_blacklist(blacklist, dirnames, filenames) # check for __init__.py - if not "__init__.py" in filenames: + if "__init__.py" not in filenames: dirnames[:] = () continue for filename in filenames: @@ -551,7 +550,7 @@ def is_standard_module( modname = modname.split(".")[0] try: filename = file_from_modpath([modname]) - except ImportError as ex: + except ImportError: # import failed, i'm probably not so wrong by supposing it's # not standard... return False @@ -656,8 +655,8 @@ def _is_namespace(modname: str) -> bool: # mypy: Module has no attribute "_namespace_packages"; maybe "fixup_namespace_packages"?" # but is still has? or is it a failure from python3 port? return ( - pkg_resources is not None and modname in pkg_resources._namespace_packages - ) # type: ignore + pkg_resources is not None and modname in pkg_resources._namespace_packages # type: ignore + ) def _module_file( @@ -684,7 +683,7 @@ def _module_file( pic = sys.path_importer_cache _path = path if path is not None else sys.path for __path in _path: - if not __path in pic: + if __path not in pic: try: pic[__path] = zipimport.zipimporter(__path) except zipimport.ZipImportError: |