Fix content.async_get() catches KeyError exceptions unrelated to txn.…

…get_child() (#1178)
plone · Oct 4, 2022 · cf3c992 · cf3c992
1 parent e2f21a3
commit cf3c992
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -4,6 +4,7 @@ CHANGELOG
 6.5.0 (unreleased)
 ------------------
 
+- Fix content.async_get() catches KeyError exceptions unrelated to txn.get_child()
 - Deps: replace aioredis with redis-py
 - Deps: updated flake8 so it won't depend on 'importlib-metadata<5'
   [masipcat]

diff --git a/guillotina/content.py b/guillotina/content.py
@@ -327,12 +327,12 @@ async def async_get(self, key: str, default=None, suppress_events=False) -> Opti
         try:
             txn = self._get_transaction()
             val = await txn.get_child(self, key)
-            if val is not None:
-                if not suppress_events:
-                    await notify(ObjectLoadedEvent(val))
-                return val
         except KeyError:
-            pass
+            val = None
+        if val is not None:
+            if not suppress_events:
+                await notify(ObjectLoadedEvent(val))
+            return val
         return default
 
     async def async_multi_get(