import_tools.discover: Correctly handle both modules and functions defined in __init__.py (#29)

* Switch to formate for autoformatting.

* import_tools.discover: Correctly handle both modules and functions defined in __init__.py

* Bump version v2.5.0 -> v2.5.1

Author: domdfcoding

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.5.0
+current_version = 2.5.1
 commit = True
 tag = True
 

README.rst

@@ -100,7 +100,7 @@ domdf_python_tools
 .. |language| image:: https://img.shields.io/github/languages/top/domdfcoding/domdf_python_tools
 	:alt: GitHub top language
 
-.. |commits-since| image:: https://img.shields.io/github/commits-since/domdfcoding/domdf_python_tools/v2.5.0
+.. |commits-since| image:: https://img.shields.io/github/commits-since/domdfcoding/domdf_python_tools/v2.5.1
 	:target: https://github.com/domdfcoding/domdf_python_tools/pulse
 	:alt: GitHub commits since tagged version
 

__pkginfo__.py

@@ -26,7 +26,7 @@
 2019-2021 Dominic Davis-Foster <[email protected]>
 """
 
-__version__ = "2.5.0"
+__version__ = "2.5.1"
 
 repo_root = pathlib.Path(__file__).parent
 install_requires = (repo_root / "requirements.txt").read_text(encoding="utf-8").split('\n')

doc-source/index.rst

@@ -104,7 +104,7 @@ domdf_python_tools
 	:alt: GitHub top language
 
 .. |commits-since| github-shield::
-	:commits-since: v2.5.0
+	:commits-since: v2.5.1
 	:alt: GitHub commits since tagged version
 
 .. |commits-latest| github-shield::

domdf_python_tools/__init__.py

@@ -26,7 +26,7 @@
 __author__: str = "Dominic Davis-Foster"
 __copyright__: str = "2014-2020 Dominic Davis-Foster"
 __license__: str = "LGPLv3+"
-__version__: str = "2.5.0"
+__version__: str = "2.5.1"
 __email__: str = "[email protected]"
 
 __docs = False

domdf_python_tools/import_tools.py

@@ -51,14 +51,19 @@
 from typing import Any, Callable, Dict, List, Optional, Type, overload
 
 # 3rd party
-from typing_extensions import Literal
+from typing_extensions import Literal, TypedDict
 
 # this package
 from domdf_python_tools.compat import importlib_metadata
 
 __all__ = ["discover", "discover_entry_points", "discover_entry_points_by_name"]
 
 
+class _DiscoverKwargsType(TypedDict):
+	match_func: Optional[Callable[[Any], bool]]
+	exclude_side_effects: bool
+
+
 @overload
 def discover(
 		package: ModuleType,
@@ -81,45 +86,66 @@ def discover(
 		exclude_side_effects: bool = True,
 		) -> List[Any]:
 	"""
-	Returns a list of objects in the given module,
-	optionally filtered by ``match_func``.
+	Returns a list of objects in the given package, optionally filtered by ``match_func``.
 
 	:param package: A Python package
 	:param match_func: Function taking an object and returning :py:obj:`True` if the object is to be included in the output.
 	:default match_func: :py:obj:`None`, which includes all objects.
 	:param exclude_side_effects: Don't include objects that are only there because of an import side effect.
 
-	:return: List of matching objects.
-
 	.. versionchanged:: 1.0.0
 
 		Added the ``exclude_side_effects`` parameter.
+	"""
 
-	.. TODO:: raise better exception when passing a module rather than a package.
-		Or just return the contents of the module?
-	"""  # noqa D400
+	kwargs: _DiscoverKwargsType = dict(exclude_side_effects=exclude_side_effects, match_func=match_func)
 
-	matching_objects = []
+	matching_objects = _discover_in_module(package, **kwargs)
 
-	for _, module_name, _ in pkgutil.walk_packages(
+	if hasattr(package, "__path__"):
 		# https://github.com/python/mypy/issues/1422
 		# Stalled PRs: https://github.com/python/mypy/pull/3527
 		#              https://github.com/python/mypy/pull/5212
-		package.__path__,  # type: ignore
-		prefix=package.__name__ + '.',
-		):
-		module = __import__(module_name, fromlist=["__trash"], level=0)
+		package_path = package.__path__  # type: ignore
+
+		for _, module_name, _ in pkgutil.walk_packages(package_path, prefix=f'{package.__name__}.'):
+			module = __import__(module_name, fromlist=["__trash"], level=0)
+
+			matching_objects.extend(_discover_in_module(module, **kwargs))
+
+	return matching_objects
+
+
+def _discover_in_module(
+		module: ModuleType,
+		match_func: Optional[Callable[[Any], bool]] = None,
+		exclude_side_effects: bool = True,
+		) -> List[Any]:
+	"""
+	Returns a list of objects in the given module, optionally filtered by ``match_func``.
+
+	:param module: A Python module.
+	:param match_func: Function taking an object and returning :py:obj:`True` if the object is to be included in the output.
+	:default match_func: :py:obj:`None`, which includes all objects.
+	:param exclude_side_effects: Don't include objects that are only there because of an import side effect.
+
+	.. versionadded:: 2.6.0
+
+	.. TODO:: make this public in that version
+	"""
+
+	matching_objects = []
 
-		# Check all the functions in that module
-		for _, imported_objects in inspect.getmembers(module, match_func):
+	# Check all the functions in that module
+	for _, imported_object in inspect.getmembers(module, match_func):
 
-			if exclude_side_effects:
-				if not hasattr(imported_objects, "__module__"):
-					continue
-				if imported_objects.__module__ != module.__name__:
-					continue
+		if exclude_side_effects:
+			if not hasattr(imported_object, "__module__"):
+				continue
+			if imported_object.__module__ != module.__name__:
+				continue
 
-			matching_objects.append(imported_objects)
+		matching_objects.append(imported_object)
 
 	return matching_objects
 

repo_helper.yml

@@ -3,7 +3,7 @@ modname: domdf_python_tools
 copyright_years: "2019-2021"
 author: "Dominic Davis-Foster"
 email: "[email protected]"
-version: "2.5.0"
+version: "2.5.1"
 username: "domdfcoding"
 license: 'LGPLv3+'
 short_desc: 'Helpful functions for Python 🐍 🛠️'

tests/discover_demo_module/__init__.py

@@ -0,0 +1,2 @@
+def foo_in_init() -> str:
+	pass

tests/test_import_tools.py

@@ -20,6 +20,7 @@
 def test_discover():
 	# Alphabetical order regardless of order in the module.
 	assert discover(discover_demo_module) == [
+			discover_demo_module.foo_in_init,
 			discover_demo_module.submodule_a.bar,
 			discover_demo_module.submodule_a.foo,
 			discover_demo_module.submodule_b.Alice,
@@ -32,6 +33,7 @@ def test_discover_function_only():
 	assert discover(
 			discover_demo_module, match_func=inspect.isfunction
 			) == [
+					discover_demo_module.foo_in_init,
 					discover_demo_module.submodule_a.bar,
 					discover_demo_module.submodule_a.foo,
 					]
@@ -74,7 +76,7 @@ def does_not_raise():
 def raises_attribute_error(obj, **kwargs):
 	return pytest.param(
 			obj,
-			pytest.raises(AttributeError, match=f"^'{type(obj).__name__}' object has no attribute '__path__'$"),
+			pytest.raises(AttributeError, match=f"^'{type(obj).__name__}' object has no attribute '__name__'$"),
 			**kwargs,
 			)