Merge branch '3.4.x' into 3.x

2 files changed, 14 insertions, 2 deletions

diff --git a/CHANGES b/CHANGES
index 36d191821..5cbd13dbc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -49,7 +49,7 @@ Bugs fixed
 Testing
 --------
 
-Release 3.4.3 (in development)
+Release 3.4.4 (in development)
 ==============================
 
 Dependencies
@@ -70,6 +70,15 @@ Bugs fixed
 Testing
 --------
 
+Release 3.4.3 (released Jan 08, 2021)
+=====================================
+
+Bugs fixed
+----------
+
+* #8655: autodoc: Failed to generate document if target module contains an
+  object that raises an exception on ``hasattr()``
+
 Release 3.4.2 (released Jan 04, 2021)
 =====================================
 
diff --git a/sphinx/ext/autodoc/mock.py b/sphinx/ext/autodoc/mock.py
index 381848fc1..3d4f76410 100644
--- a/sphinx/ext/autodoc/mock.py
+++ b/sphinx/ext/autodoc/mock.py
@@ -153,7 +153,10 @@ def mock(modnames: List[str]) -> Generator[None, None, None]:
 def ismock(subject: Any) -> bool:
     """Check if the object is mocked."""
     # check the object has '__sphinx_mock__' attribute
-    if not hasattr(subject, '__sphinx_mock__'):
+    try:
+        if safe_getattr(subject, '__sphinx_mock__', None) is None:
+            return False
+    except AttributeError:
         return False
 
     # check the object is mocked module