Always getattr() in lazy import machinery (#1963)

* Always getattr() in lazy import machinery * Add explanatory safety comment about getattr recursion * update releasehistory --------- Co-authored-by: Jeff Wagner <[email protected]>
openforcefield · Jan 7, 2025 · 18d9ddb · 18d9ddb
1 parent c303f30
commit 18d9ddb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/docs/releasehistory.md b/docs/releasehistory.md
@@ -11,6 +11,7 @@ Releases follow the `major.minor.micro` scheme recommended by [PEP440](https://w
 ### API-breaking changes
 
 ### Behavior changes
+- [PR #1963](https://github.com/openforcefield/openff-toolkit/pull/1963): Always use `getattr` in lazy loading machinery.
 
 ### Bugfixes
 

diff --git a/openff/toolkit/__init__.py b/openff/toolkit/__init__.py
@@ -78,10 +78,13 @@ def __getattr__(name):
     obj_mod = _lazy_imports_obj.get(name)
     if obj_mod is not None:
         mod = importlib.import_module(obj_mod)
-        try:
-            return mod.__dict__[name]
-        except KeyError:  # account for lazy loaders
-            return getattr(mod, name)
+        # This only causes an infinite recursive loop if an object that does not
+        # exist is declared in `_lazy_imports_obj` to be lazy loaded from the
+        # current module. Since there is no reason to include either an object
+        # from the current module or an object that does not exist in
+        # `_lazy_imports_obj`, and since the function would fail in this case
+        # anyway, this is safe.
+        return getattr(mod, name)
 
     lazy_mod = _lazy_imports_mod.get(name)
     if lazy_mod is not None: