Fix(ImportHooks): Fix another RecursionError under PyPy3

CheetahTemplate3 · Jul 29, 2024 · 86908f1 · 86908f1
1 parent b75f651
commit 86908f1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/Cheetah/ImportManager.py b/Cheetah/ImportManager.py
@@ -507,6 +507,7 @@ def importHook(self, name, globals=None, locals=None,
 
     def doimport(self, nm, parentnm, fqname):
         # Not that nm is NEVER a dotted name at this point
+        mod = None
         if parentnm:
             parent = sys.modules[parentnm]
             if hasattr(parent, '__path__'):
@@ -525,7 +526,10 @@ def doimport(self, nm, parentnm, fqname):
                 try:
                     mod = director.getmod(nm)
                 except RecursionError:
-                    mod = __oldimport__(nm)  # noqa: F821 undefined name
+                    try:
+                        mod = __oldimport__(nm)  # noqa: F821 undefined name
+                    except RecursionError:
+                        pass
                 if mod:
                     break
         if mod:

diff --git a/docs/news.rst b/docs/news.rst
@@ -19,6 +19,8 @@ Bug fixes:
   - Fixed mapping test in ``NameMapper.py``:
     Python 3.13 brough a new mapping type ``FrameLocalsProxy``.
 
+  - Fixed another ``RecursionError`` in ``ImportHooks`` under PyPy3.
+
 Tests:
 
   - tox: Run tests under Python 3.13.