fix all usage of pkgutil.walk_packages where finder is used wrong

Summary: find_loader().load_module() is deprecated lets just use importlib where possible.

Reviewed By: itamaro

Differential Revision: D70993911

fbshipit-source-id: 87c37cfc0827afbafd7412d98c0b95041cc9a542

Author: fried

flowtorch/docs.py

@@ -9,7 +9,7 @@
 from collections.abc import Callable, Mapping, Sequence
 from inspect import isclass, isfunction, signature
 from types import ModuleType
-from typing import Any, Dict, Optional, Tuple
+from typing import Any
 
 
 def get_decorators(function: Callable) -> Sequence[str]:
@@ -259,35 +259,16 @@ def walk_packages(
 
     # The followings line uncovered a bug that hasn't been fixed in mypy:
     # https://github.com/python/mypy/issues/1422
-    for importer, this_modname, _ in pkgutil.walk_packages(
+    for _, this_modname, _ in pkgutil.walk_packages(
         path=path,  # type: ignore  # mypy issue #1422
         prefix=f"{module.__name__}.",
         onerror=lambda x: None,
     ):
-        # Conditions required for mypy
-        if importer is not None:
-            if isinstance(importer, importlib.abc.MetaPathFinder):
-                finder = importer.find_module(this_modname, None)
-            elif isinstance(importer, importlib.abc.PathEntryFinder):
-                finder = importer.find_module(this_modname)
-        else:
-            finder = None
-
-        # pyre-fixme[61]: `finder` is undefined, or not always defined.
-        if finder is not None:
-            module = finder.load_module(this_modname)
-
-        else:
-            raise Exception("Finder is none")
+        module = importlib.import_module(this_modname)
 
         if module is not None:
             # Get all classes and functions imported/defined in module
             modules[this_modname] = (module, documentable_symbols(module))
-
-            del module
-            # pyre-fixme[61]: `finder` is undefined, or not always defined.
-            del finder
-
         else:
             raise Exception("Module is none")
 

flowtorch/utils.py

@@ -8,7 +8,7 @@
 import pkgutil
 from collections.abc import Callable, Sequence
 from functools import partial
-from typing import Any, Optional, Tuple
+from typing import Any
 
 import flowtorch
 from flowtorch.bijectors.base import Bijector
@@ -67,34 +67,18 @@ def _walk_packages(
 
     # The followings line uncovered a bug that hasn't been fixed in mypy:
     # https://github.com/python/mypy/issues/1422
-    for importer, this_modname, _ in pkgutil.walk_packages(
+    for _, this_modname, _ in pkgutil.walk_packages(
         path=path,  # type: ignore  # mypy issue #1422
         prefix=f"{flowtorch.__name__}.{modname}.",
         onerror=lambda x: None,
     ):
-        # Conditions required for mypy
-        if importer is not None:
-            if isinstance(importer, importlib.abc.MetaPathFinder):
-                finder = importer.find_module(this_modname, None)
-            elif isinstance(importer, importlib.abc.PathEntryFinder):
-                finder = importer.find_module(this_modname)
-        else:
-            finder = None
-
-        # pyre-fixme[61]: `finder` is undefined, or not always defined.
-        if finder is not None:
-            module = finder.load_module(this_modname)
-
-        else:
-            raise Exception("Finder is none")
+        module = importlib.import_module(this_modname)
 
         if module is not None:
             this_classes = inspect.getmembers(module, filter)
             classes.extend(this_classes)
 
             del module
-            # pyre-fixme[61]: `finder` is undefined, or not always defined.
-            del finder
 
         else:
             raise Exception("Module is none")